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

Correctly check for acquire doneness.

Browse Source
This commit is contained in:
JoelKatz
2012-12-25 21:07:53 -08:00
parent be2e55d49c
commit fa1db60011
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpp/ripple/LedgerAcquire.h
View File

@@ -90,6 +90,7 @@ public:
bool isBase() const { return mHaveBase; } bool isBase() const { return mHaveBase; }
bool isAcctStComplete() const { return mHaveState; } bool isAcctStComplete() const { return mHaveState; }
bool isTransComplete() const { return mHaveTransactions; } bool isTransComplete() const { return mHaveTransactions; }
bool isDone() const { return mAborted || isComplete() || isFailed(); }
Ledger::pointer getLedger() { return mLedger; } Ledger::pointer getLedger() { return mLedger; }
void abort() { mAborted = true; } void abort() { mAborted = true; }
bool setAccept() { if (mAccept) return false; mAccept = true; return true; } bool setAccept() { if (mAccept) return false; mAccept = true; return true; }

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

@@ -178,7 +178,7 @@ void LedgerMaster::resumeAcquiring()
return; return;
mTooFast = false; mTooFast = false;
if (mMissingLedger && (mMissingLedger->isComplete() || mMissingLedger->isFailed())) if (mMissingLedger && mMissingLedger->isDone())
mMissingLedger.reset(); mMissingLedger.reset();
if (mMissingLedger || !theConfig.LEDGER_HISTORY) if (mMissingLedger || !theConfig.LEDGER_HISTORY)
@@ -231,7 +231,7 @@ void LedgerMaster::setFullLedger(Ledger::ref ledger)
} }
} }
if (mMissingLedger && (mMissingLedger->isComplete() || mMissingLedger->isFailed())) if (mMissingLedger && mMissingLedger->isDone())
mMissingLedger.reset(); mMissingLedger.reset();
if (mMissingLedger || !theConfig.LEDGER_HISTORY) if (mMissingLedger || !theConfig.LEDGER_HISTORY)