ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-24 04:55: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

6
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -889,7 +889,7 @@ std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> >
{
Database* db = theApp->getTxnDB()->getDB();
ScopedLock dbLock = theApp->getTxnDB()->getDBLock();
ScopedLock sl(theApp->getTxnDB()->getDBLock());
SQL_FOREACH(db, sql)
{
@@ -923,7 +923,7 @@ std::vector<RippleAddress>
RippleAddress acct;
{
Database* db = theApp->getTxnDB()->getDB();
ScopedLock dblock = theApp->getTxnDB()->getDBLock();
ScopedLock sl(theApp->getTxnDB()->getDBLock());
SQL_FOREACH(db, sql)
{
if (acct.setAccountID(db->getStrBinary("Account")))
@@ -1016,7 +1016,7 @@ void NetworkOPs::pubLedger(Ledger::ref lpAccepted)
if (NetworkOPs::omDISCONNECTED == getOperatingMode())
return;
LoadEvent::pointer event = theApp->getJobQueue().getLoadEvent(jtPUBLEDGER);
LoadEvent::autoptr event(theApp->getJobQueue().getLoadEventAP(jtPUBLEDGER));
{
boost::recursive_mutex::scoped_lock sl(mMonitorLock);