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

Fixes.

Browse Source
This commit is contained in:
JoelKatz
2013-08-11 17:10:12 -07:00
parent f9eb6b5ee1
commit 28b239243b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -161,13 +161,6 @@ void LedgerMaster::storeLedger (Ledger::pointer ledger)
void LedgerMaster::forceValid (Ledger::pointer ledger) void LedgerMaster::forceValid (Ledger::pointer ledger)
{ {
ledger->setValidated(); ledger->setValidated();
boost::recursive_mutex::scoped_lock sl (mLock);
if (!mValidLedger || (mPubLedger->getLedgerSeq() < ledger->getLedgerSeq()))
mValidLedger = ledger;
if (!mPubLedger || (mPubLedger->getLedgerSeq() < 2))
mPubLedger = ledger;
setFullLedger(ledger, true, false); setFullLedger(ledger, true, false);
} }
@@ -442,6 +435,8 @@ void LedgerMaster::setFullLedger (Ledger::pointer ledger, bool isSynchronous, bo
if (!mValidLedger || (ledger->getLedgerSeq() > mValidLedger->getLedgerSeq())) if (!mValidLedger || (ledger->getLedgerSeq() > mValidLedger->getLedgerSeq()))
mValidLedger = ledger; mValidLedger = ledger;
if (!mPubLedger)
mPubLedger = ledger;
if ((ledger->getLedgerSeq () != 0) && mCompleteLedgers.hasValue (ledger->getLedgerSeq () - 1)) if ((ledger->getLedgerSeq () != 0) && mCompleteLedgers.hasValue (ledger->getLedgerSeq () - 1))
{ {
@@ -514,6 +509,8 @@ void LedgerMaster::checkAccept (uint256 const& hash, uint32 seq)
ledger->setValidated(); ledger->setValidated();
mValidLedger = ledger; mValidLedger = ledger;
if (!mPubLedger)
mPubLedger = ledger;
uint64 fee, fee2, ref; uint64 fee, fee2, ref;
ref = getApp().getFeeTrack().getLoadBase(); ref = getApp().getFeeTrack().getLoadBase();
@@ -691,7 +688,7 @@ void LedgerMaster::tryAdvance()
{ {
boost::recursive_mutex::scoped_lock ml (mLock); boost::recursive_mutex::scoped_lock ml (mLock);
if (!mAdvanceThread) if (!mAdvanceThread && mValidLedger)
{ {
mAdvanceThread = true; mAdvanceThread = true;
getApp().getJobQueue ().addJob (jtPUBLEDGER, "Ledger::advanceThread", getApp().getJobQueue ().addJob (jtPUBLEDGER, "Ledger::advanceThread",