diff --git a/src/Ledger.cpp b/src/Ledger.cpp index e22eac796..31ee8a8a9 100644 --- a/src/Ledger.cpp +++ b/src/Ledger.cpp @@ -339,6 +339,7 @@ uint256 Ledger::getHash() void Ledger::saveAcceptedLedger(bool fromConsensus) { // can be called in a different thread + cLog(lsTRACE) << "saveAcceptedLedger " << (fromConsensus ? "fromConsensus" : "fromAcquire") << getLedgerSeq(); static boost::format ledgerExists("SELECT LedgerSeq FROM Ledgers where LedgerSeq = %d;"); static boost::format deleteLedger("DELETE FROM Ledgers WHERE LedgerSeq = %d;"); static boost::format AcctTransExists("SELECT LedgerSeq FROM AccountTransactions WHERE TransId = '%s';"); diff --git a/src/LedgerAcquire.h b/src/LedgerAcquire.h index dc717efee..c2a3c6b2d 100644 --- a/src/LedgerAcquire.h +++ b/src/LedgerAcquire.h @@ -111,14 +111,14 @@ protected: LedgerAcquire::pointer mCurrentLedger; // ledger we are acquiring bool mCheckComplete; // should we check to make sure we have all nodes - void updateCurrentLedger(Ledger::pointer currentLedger); void done(); void addPeers(); static void onComplete(boost::weak_ptr, LedgerAcquire::pointer); public: - LedgerAcquireSet(Ledger::ref targetLedger, Ledger::ref currentLedger); + LedgerAcquireSet(Ledger::ref targetLedger); + void updateCurrentLedger(Ledger::pointer currentLedger); }; class LedgerAcquireMaster @@ -140,7 +140,10 @@ public: bool hasSet() { return !!mAcquireSet; } void killSet(const LedgerAcquireSet&) { mAcquireSet = LedgerAcquireSet::pointer(); } void makeSet(Ledger::ref target, Ledger::ref current) - { mAcquireSet = boost::make_shared(boost::ref(target), boost::ref(current)); } + { + mAcquireSet = boost::make_shared(boost::ref(target)); + mAcquireSet->updateCurrentLedger(current); + } }; #endif