Merge pull request #813 from dooglus/master

Fix #794. Only remove transactions from memory pool when they're actually in the memory pool.
This commit is contained in:
Gavin Andresen 2012-02-10 09:04:19 -08:00
commit b0cfef3214

View file

@ -618,11 +618,15 @@ bool CTransaction::RemoveFromMemoryPool()
// Remove transaction from memory pool // Remove transaction from memory pool
CRITICAL_BLOCK(cs_mapTransactions) CRITICAL_BLOCK(cs_mapTransactions)
{ {
BOOST_FOREACH(const CTxIn& txin, vin) uint256 hash = GetHash();
mapNextTx.erase(txin.prevout); if (mapTransactions.count(hash))
mapTransactions.erase(GetHash()); {
nTransactionsUpdated++; BOOST_FOREACH(const CTxIn& txin, vin)
--nPooledTx; mapNextTx.erase(txin.prevout);
mapTransactions.erase(hash);
nTransactionsUpdated++;
--nPooledTx;
}
} }
return true; return true;
} }