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 branch 'master' of github.com:jedmccaleb/NewCoin into develop

Browse Source
This commit is contained in:
JoelKatz
2013-04-05 09:58:08 -07:00
parent 48635bb843 04d48a6d21
commit fd769cdca1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -395,10 +395,17 @@ void LedgerConsensus::mapComplete(const uint256& hash, SHAMap::ref map, bool acq
}
assert(hash == map->getHash());
boost::unordered_map<uint256, SHAMap::pointer>::iterator it = mAcquired.find(hash);
if (mAcquired.find(hash) != mAcquired.end())
{
mAcquiring.erase(hash);
return; // we already have this map
if (it->second)
{
mAcquiring.erase(hash);
return; // we already have this map
}
// We previously failed to acquire this map, now we have it
mAcquired.erase(hash);
}
if (mOurPosition && (!mOurPosition->isBowOut()) && (hash != mOurPosition->getCurrentHash()))