ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-29 23:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash bug Arthur reported.

Browse Source
This commit is contained in:
JoelKatz
2013-01-15 17:09:57 -08:00
parent c57e28c55b
commit fb3e2e8af4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,7 @@ TER LedgerMaster::doTransaction(const SerializedTransaction& txn, TransactionEng
bool LedgerMaster::haveLedgerRange(uint32 from, uint32 to) bool LedgerMaster::haveLedgerRange(uint32 from, uint32 to)
{ {
boost::recursive_mutex::scoped_lock sl(mLock);
uint32 prevMissing = mCompleteLedgers.prevMissing(to + 1); uint32 prevMissing = mCompleteLedgers.prevMissing(to + 1);
return (prevMissing == RangeSet::RangeSetAbsent) || (prevMissing < from); return (prevMissing == RangeSet::RangeSetAbsent) || (prevMissing < from);
} }

12
src/cpp/ripple/LedgerMaster.h
View File

@@ -82,7 +82,11 @@ public:
void switchLedgers(Ledger::ref lastClosed, Ledger::ref newCurrent); void switchLedgers(Ledger::ref lastClosed, Ledger::ref newCurrent);
std::string getCompleteLedgers() { return mCompleteLedgers.toString(); } std::string getCompleteLedgers()
{
boost::recursive_mutex::scoped_lock sl(mLock);
return mCompleteLedgers.toString();
}
Ledger::pointer closeLedger(bool recoverHeldTransactions); Ledger::pointer closeLedger(bool recoverHeldTransactions);
@@ -108,7 +112,11 @@ public:
return mLedgerHistory.getLedgerByHash(hash); return mLedgerHistory.getLedgerByHash(hash);
} }
void setLedgerRangePresent(uint32 minV, uint32 maxV) { mCompleteLedgers.setRange(minV, maxV); } void setLedgerRangePresent(uint32 minV, uint32 maxV)
{
boost::recursive_mutex::scoped_lock sl(mLock);
mCompleteLedgers.setRange(minV, maxV);
}
void addHeldTransaction(const Transaction::pointer& trans); void addHeldTransaction(const Transaction::pointer& trans);
void fixMismatch(Ledger::ref ledger); void fixMismatch(Ledger::ref ledger);