AlreadyHave(): only hold lock during mapTransactions access

This commit is contained in:
Jeff Garzik 2012-04-17 12:30:00 -04:00 committed by Jeff Garzik
parent dd21ce5f1b
commit 8bff8ac079

View File

@ -2137,8 +2137,12 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
{ {
case MSG_TX: case MSG_TX:
{ {
LOCK(cs_mapTransactions); bool txInMap = false;
return mapTransactions.count(inv.hash) || {
LOCK(cs_mapTransactions);
txInMap = (mapTransactions.count(inv.hash) != 0);
}
return txInMap ||
mapOrphanTransactions.count(inv.hash) || mapOrphanTransactions.count(inv.hash) ||
txdb.ContainsTx(inv.hash); txdb.ContainsTx(inv.hash);
} }