AlreadyHave(): only hold lock during mapTransactions access

This commit is contained in:
Jeff Garzik
2012-04-17 12:30:00 -04:00
committed by Luke Dashjr
parent 12570da46f
commit 1175d8f6a1

View File

@@ -1954,11 +1954,15 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
switch (inv.type)
{
case MSG_TX:
{
bool txInMap = false;
CRITICAL_BLOCK(cs_mapTransactions)
{
return mapTransactions.count(inv.hash) ||
mapOrphanTransactions.count(inv.hash) ||
txdb.ContainsTx(inv.hash);
txInMap = (mapTransactions.count(inv.hash) != 0);
}
return txInMap ||
mapOrphanTransactions.count(inv.hash) ||
txdb.ContainsTx(inv.hash);
}
case MSG_BLOCK: return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash);