From 26915da1a4b7e723866140c9ae21f2a1dee16191 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 13 Dec 2012 16:36:20 -0800 Subject: [PATCH 1/2] Temporary workaround. --- src/cpp/ripple/LedgerConsensus.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cpp/ripple/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp index 7401461e8..3b0b09101 100644 --- a/src/cpp/ripple/LedgerConsensus.cpp +++ b/src/cpp/ripple/LedgerConsensus.cpp @@ -331,8 +331,10 @@ void LedgerConsensus::checkOurValidation() std::vector validation = v->getSigned(); ripple::TMValidation val; val.set_validation(&validation[0], validation.size()); +#if 0 theApp->getConnectionPool().relayMessage(NULL, boost::make_shared(val, ripple::mtVALIDATION)); +#endif theApp->getOPs().setLastValidation(v); cLog(lsWARNING) << "Sending partial validation"; } From f8e98694c6ff66e09ec8d0bd2c161ea77cb900a9 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 13 Dec 2012 16:41:28 -0800 Subject: [PATCH 2/2] Emergency workaround. --- src/cpp/ripple/LedgerConsensus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp/ripple/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp index 3b0b09101..bf92b700c 100644 --- a/src/cpp/ripple/LedgerConsensus.cpp +++ b/src/cpp/ripple/LedgerConsensus.cpp @@ -300,7 +300,7 @@ LedgerConsensus::LedgerConsensus(const uint256& prevLCLHash, Ledger::ref previou handleLCL(mPrevLedgerHash); if (!mHaveCorrectLCL) { - mProposing = mValidating = false; +// mProposing = mValidating = false; cLog(lsINFO) << "Entering consensus with: " << previousLedger->getHash(); cLog(lsINFO) << "Correct LCL is: " << prevLCLHash; } @@ -399,7 +399,7 @@ void LedgerConsensus::handleLCL(const uint256& lclHash) propose(); } mProposing = false; - mValidating = false; +// mValidating = false; mPeerPositions.clear(); mDisputes.clear(); mCloseTimes.clear();