From ec625a608f2a30706f207d21c38d0283dae7860d Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 5 Sep 2012 14:37:42 -0700 Subject: [PATCH] Small tweaks. --- src/LedgerConsensus.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index 12fd086f9c..54c3caf61e 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -501,8 +501,6 @@ void LedgerConsensus::statePreClose() statusChange(newcoin::neCLOSING_LEDGER, *mPreviousLedger); takeInitialPosition(*theApp->getMasterLedger().closeLedger()); } - else if (mHaveCorrectLCL) - checkLCL(); // double check } void LedgerConsensus::stateEstablish() @@ -536,7 +534,7 @@ void LedgerConsensus::stateAccepted() void LedgerConsensus::timerEntry() { - if ((!mHaveCorrectLCL && (mState != lcsACCEPTED)) || (mState == lcsPRE_CLOSE)) + if ((mState != lcsFINISHED) && (mState != lcsACCEPTED)) checkLCL(); mCurrentMSeconds = @@ -639,7 +637,7 @@ void LedgerConsensus::updateOurPositions() Log(lsINFO) << "CCTime: " << it->first << " has " << it->second << " out of " << thresh; if (it->second > thresh) { - Log(lsINFO) << "Close time consensus reached: " << closeTime; + Log(lsINFO) << "Close time consensus reached: " << it->first; mHaveCloseTimeConsensus = true; closeTime = it->first; thresh = it->second;