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

bugfixes.

Browse Source
This commit is contained in:
JoelKatz
2013-08-11 17:18:57 -07:00
parent 28b239243b
commit 1a69b06670
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -497,8 +497,10 @@ void LedgerMaster::checkAccept (uint256 const& hash, uint32 seq)
if (!ledger)
{
getApp().getInboundLedgers ().findCreate (hash, seq);
return;
InboundLedger::pointer i = getApp().getInboundLedgers ().findCreate (hash, seq);
if (!i->isDone() || !i->isComplete() || i->isFailed())
return;
ledger = i->getLedger();
}
if (ledger->getLedgerSeq() != seq)
@@ -529,7 +531,7 @@ void LedgerMaster::checkAccept (uint256 const& hash, uint32 seq)
void LedgerMaster::advanceThread()
{
boost::recursive_mutex::scoped_lock sl (mLock);
assert (mValidLedger);
assert (mValidLedger && mAdvanceThread);
bool progress;
@@ -562,7 +564,7 @@ void LedgerMaster::advanceThread()
if (acq && acq->isComplete())
ledger = acq->getLedger();
}
}
}
if (ledger)
{
sl.unlock();
@@ -574,19 +576,19 @@ void LedgerMaster::advanceThread()
}
}
}
else
}
else
{
BOOST_FOREACH(Ledger::ref ledger, pubLedgers)
{
BOOST_FOREACH(Ledger::ref ledger, pubLedgers)
{
sl.unlock();
sl.unlock();
setFullLedger(ledger, true, true);
getApp().getOPs().pubLedger(ledger);
setFullLedger(ledger, true, true);
getApp().getOPs().pubLedger(ledger);
sl.lock();
mPubLedger = ledger;
progress = true;
}
sl.lock();
mPubLedger = ledger;
progress = true;
}
}
} while (progress);