ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Must hold lock to call LedgerConsensusImp::getJson.

Browse Source
This commit is contained in:
JoelKatz
2015-12-03 16:36:20 -08:00
committed by Nik Bougalis
parent 999701e384
commit a8cdd4f66d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ripple/app/ledger/impl/LedgerConsensusImp.cpp
View File

@@ -971,6 +971,8 @@ void LedgerConsensusImp::simulate ()
void LedgerConsensusImp::accept (std::shared_ptr<SHAMap> set)
{
Json::Value consensusStatus;
{
auto lock = beast::make_lock(app_.getMasterMutex());
@@ -979,6 +981,7 @@ void LedgerConsensusImp::accept (std::shared_ptr<SHAMap> set)
consensus_.takePosition (mPreviousLedger->info().seq, set);
assert (set->getHash ().as_uint256() == mOurPosition->getCurrentHash ());
consensusStatus = getJson (true);
}
auto closeTime = mOurPosition->getCloseTime ();
@@ -1135,7 +1138,7 @@ void LedgerConsensusImp::accept (std::shared_ptr<SHAMap> set)
<< "CNF newLCL " << newLCLHash;
// See if we can accept a ledger as fully-validated
ledgerMaster_.consensusBuilt (newLCL, getJson (true));
ledgerMaster_.consensusBuilt (newLCL, std::move (consensusStatus));
{
// Apply disputed transactions that didn't get in