Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
Arthur Britto
2012-11-28 19:19:57 -08:00
19 changed files with 81 additions and 48 deletions

View File

@@ -1169,7 +1169,7 @@ Json::Value RPCHandler::doTxHistory(const Json::Value& params)
{
Database* db = theApp->getTxnDB()->getDB();
ScopedLock dbLock = theApp->getTxnDB()->getDBLock();
ScopedLock sl (theApp->getTxnDB()->getDBLock());
SQL_FOREACH(db, sql)
{
@@ -1493,7 +1493,7 @@ Json::Value RPCHandler::doCommand(const std::string& command, Json::Value& param
cLog(lsTRACE) << "RPC:" << command;
cLog(lsTRACE) << "RPC params:" << params;
LoadEvent::pointer le = theApp->getJobQueue().getLoadEvent(jtRPC);
LoadEvent::autoptr le(theApp->getJobQueue().getLoadEventAP(jtRPC));
mRole = role;