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

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