An imperfect fix for the case where we get validations during the consensus process for the next ledger and

think it's a change in the previous ledger.
This commit is contained in:
JoelKatz
2012-09-03 20:36:51 -07:00
parent cfedc4b981
commit 00199d3915

View File

@@ -264,6 +264,7 @@ void LedgerConsensus::checkLCL()
if (netLgr != mPrevLedgerHash)
{ // LCL change
Log(lsWARNING) << "View of consensus changed during consensus (" << netLgrCount << ")";
Log(lsWARNING) << mPrevLedgerHash << " to " << netLgr;
if (mHaveCorrectLCL)
theApp->getOPs().consensusViewChange();
handleLCL(netLgr);
@@ -519,7 +520,8 @@ void LedgerConsensus::stateAccepted()
void LedgerConsensus::timerEntry()
{
checkLCL();
if ((!mHaveCorrectLCL) || (mState == lcsPRE_CLOSE))
checkLCL();
mCurrentMSeconds =
(boost::posix_time::microsec_clock::universal_time() - mConsensusStartTime).total_milliseconds();