ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fetch_fix'

Browse Source
This commit is contained in:
JoelKatz
2013-05-17 01:06:03 -07:00
parent fb7e01da41 a71225f9a3
commit fda807bcc0
7 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -557,7 +557,10 @@ void LedgerMaster::checkAccept(const uint256& hash, uint32 seq)
Ledger::pointer ledger = mLedgerHistory.getLedgerByHash(hash);
if (!ledger)
{
theApp->getMasterLedgerAcquire().findCreate(hash, seq);
return;
}
mValidLedger = ledger;
tryPublish();
@@ -575,6 +578,8 @@ void LedgerMaster::tryPublish()
}
else if (mValidLedger->getLedgerSeq() > (mPubLedger->getLedgerSeq() + MAX_LEDGER_GAP))
{
cLog(lsWARNING) << "Gap in validated ledger stream " << mPubLedger->getLedgerSeq() << " - " <<
mValidLedger->getLedgerSeq() - 1;
mPubLedger = mValidLedger;
mPubLedgers.push_back(mValidLedger);
}
@@ -613,11 +618,11 @@ void LedgerMaster::tryPublish()
{
if (theApp->getMasterLedgerAcquire().isFailure(hash))
{
cLog(lsFATAL) << "Unable to acquire a recent validated ledger";
cLog(lsWARNING) << "Unable to acquire a recent validated ledger";
}
else
{
LedgerAcquire::pointer acq = theApp->getMasterLedgerAcquire().findCreate(hash, 0);
LedgerAcquire::pointer acq = theApp->getMasterLedgerAcquire().findCreate(hash, seq);
if (!acq->isDone())
{
acq->setAccept();