From fa1db6001164bdc5448fcfa5a6c949d84f884f40 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 25 Dec 2012 21:07:53 -0800 Subject: [PATCH] Correctly check for acquire doneness. --- src/cpp/ripple/LedgerAcquire.h | 1 + src/cpp/ripple/LedgerMaster.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cpp/ripple/LedgerAcquire.h b/src/cpp/ripple/LedgerAcquire.h index 2f9778c565..c677d6226e 100644 --- a/src/cpp/ripple/LedgerAcquire.h +++ b/src/cpp/ripple/LedgerAcquire.h @@ -90,6 +90,7 @@ public: bool isBase() const { return mHaveBase; } bool isAcctStComplete() const { return mHaveState; } bool isTransComplete() const { return mHaveTransactions; } + bool isDone() const { return mAborted || isComplete() || isFailed(); } Ledger::pointer getLedger() { return mLedger; } void abort() { mAborted = true; } bool setAccept() { if (mAccept) return false; mAccept = true; return true; } diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp index be3ba69631..f32749a6c8 100644 --- a/src/cpp/ripple/LedgerMaster.cpp +++ b/src/cpp/ripple/LedgerMaster.cpp @@ -178,7 +178,7 @@ void LedgerMaster::resumeAcquiring() return; mTooFast = false; - if (mMissingLedger && (mMissingLedger->isComplete() || mMissingLedger->isFailed())) + if (mMissingLedger && mMissingLedger->isDone()) mMissingLedger.reset(); 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(); if (mMissingLedger || !theConfig.LEDGER_HISTORY)