ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jed
2012-11-29 09:23:08 -08:00
parent 32c231ab57 377747fb2c
commit 92cee7d089
16 changed files with 93 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/ripple/RPCHandler.cpp
View File

@@ -1158,7 +1158,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)
{
@@ -1475,7 +1475,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;