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

Merge fixes.

Browse Source
This commit is contained in:
JoelKatz
2013-04-26 00:47:35 -07:00
parent 09b6c7cc61
commit cc04847961
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/ripple/LedgerAcquire.cpp
View File

@@ -933,7 +933,10 @@ void LedgerAcquireMaster::gotLedgerData(Job&, uint256 hash,
cLog(lsWARNING) << "Included TXbase invalid";
}
if (!san.isInvalid())
{
ledger->progress();
ledger->trigger(peer);
}
return;
}
@@ -967,7 +970,10 @@ void LedgerAcquireMaster::gotLedgerData(Job&, uint256 hash,
else
ledger->takeAsNode(nodeIDs, nodeData, ret);
if (!ret.isInvalid())
ledger->trigger(peer);
{
ledger->progress();
ledger->trigger(peer);
}
return;
}

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

@@ -265,7 +265,7 @@ bool LedgerMaster::acquireMissingLedger(Ledger::ref origLedger, const uint256& l
{
typedef std::pair<uint32, uint256> u_pair;
std::vector<u_pair> vec = origLedger->getLedgerHashes();
BOOST_FOREACH(const u_pair& it, vec)
BOOST_REVERSE_FOREACH(const u_pair& it, vec)
{
if ((fetchCount < fetchMax) && (it.first < ledgerSeq) &&
!mCompleteLedgers.hasValue(it.first) && !theApp->getMasterLedgerAcquire().find(it.second))