From 562d0a658eb8b2bdbab2922bf4ca417a5f58d024 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 18 Jun 2012 00:44:27 -0700 Subject: [PATCH] Tiny bugfix. --- src/LedgerConsensus.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index bf17cd74a..b93875ea5 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -363,7 +363,7 @@ int LedgerConsensus::timerEntry() case lcsCUTOFF: return stateCutoff(sinceClose); case lcsFINISHED: return stateFinished(sinceClose); case lcsACCEPTED: return stateAccepted(sinceClose); - case lcsABORTED: return stateAccepted(sinceClose); + case lcsABORTED: return 1; } assert(false); return 1; @@ -702,7 +702,6 @@ void LedgerConsensus::accept(SHAMap::pointer set) #endif ScopedLock sl = theApp->getMasterLedger().getLock(); - applyTransactions(theApp->getMasterLedger().getCurrentLedger()->peekTransactionMap(), newOL, failedTransactions); theApp->getMasterLedger().pushLedger(newLCL, newOL); mState = lcsACCEPTED;