ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the deadlock. Can't hold the LedgerMaster lock when calling a pub* function.

Browse Source
This commit is contained in:
JoelKatz
2013-04-03 14:17:06 -07:00
parent 1894b2d4b8
commit 88dba87fa9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,10 +122,13 @@ Ledger::pointer LedgerMaster::closeLedger(bool recover)
TER LedgerMaster::doTransaction(SerializedTransaction::ref txn, TransactionEngineParams params, bool& didApply)
{
boost::recursive_mutex::scoped_lock sl(mLock);
TER result = mEngine.applyTransaction(*txn, params, didApply);
{
boost::recursive_mutex::scoped_lock sl(mLock);
TER result = mEngine.applyTransaction(*txn, params, didApply);
Ledger::pointer ledger = mEngine.getLedger();
}
// if (didApply)
theApp->getOPs().pubProposedTransaction(mEngine.getLedger(), txn, result);
theApp->getOPs().pubProposedTransaction(ledger, txn, result);
return result;
}