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

Fix a race applying connections to the open ledger.

Browse Source
This commit is contained in:
JoelKatz
2013-04-02 13:41:42 -07:00
parent 24fe80e629
commit 00e2ac8298
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -74,10 +74,10 @@ void LedgerMaster::switchLedgers(Ledger::pointer lastClosed, Ledger::pointer cur
mFinalizedLedger->setClosed(); mFinalizedLedger->setClosed();
mFinalizedLedger->setAccepted(); mFinalizedLedger->setAccepted();
mCurrentLedger = current; mCurrentLedger = current;
}
assert(!mCurrentLedger->isClosed()); assert(!mCurrentLedger->isClosed());
mEngine.setLedger(mCurrentLedger); mEngine.setLedger(mCurrentLedger);
}
checkAccept(lastClosed->getHash(), lastClosed->getLedgerSeq()); checkAccept(lastClosed->getHash(), lastClosed->getLedgerSeq());
} }
@@ -122,6 +122,7 @@ Ledger::pointer LedgerMaster::closeLedger(bool recover)
TER LedgerMaster::doTransaction(SerializedTransaction::ref txn, TransactionEngineParams params, bool& didApply) TER LedgerMaster::doTransaction(SerializedTransaction::ref txn, TransactionEngineParams params, bool& didApply)
{ {
boost::recursive_mutex::scoped_lock sl(mLock);
TER result = mEngine.applyTransaction(*txn, params, didApply); TER result = mEngine.applyTransaction(*txn, params, didApply);
// if (didApply) // if (didApply)
theApp->getOPs().pubProposedTransaction(mEngine.getLedger(), txn, result); theApp->getOPs().pubProposedTransaction(mEngine.getLedger(), txn, result);