Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
jed
2012-06-24 14:29:29 -07:00

View File

@@ -60,15 +60,18 @@ Ledger::pointer LedgerHistory::getLedgerByHash(const uint256& hash)
Ledger::pointer ret = mLedgersByHash.fetch(hash);
if (ret) return ret;
#if 0
// FIXME: A ledger without SHA maps isn't very useful
// This code will need to build them
// ret = Ledger::loadByHash(hash);
// if (!ret) return ret;
// assert(ret->getHash() == hash);
ret = Ledger::loadByHash(hash);
if (!ret) return ret;
assert(ret->getHash() == hash);
boost::recursive_mutex::scoped_lock sl(mLedgersByHash.peekMutex());
mLedgersByHash.canonicalize(hash, ret);
if (ret->isAccepted()) mLedgersByIndex[ret->getLedgerSeq()] = ret;
#endif
return ret;
}