AlreadyHave(): only hold lock during mapTransactions access

2012-04-17 12:30:00 -04:00 · 2012-04-17 12:30:00 -04:00 · 8bff8ac079
commit 8bff8ac079
parent dd21ce5f1b
1 changed files with 6 additions and 2 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -2137,8 +2137,12 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
    {
    case MSG_TX:
        {
-        LOCK(cs_mapTransactions);
-        return mapTransactions.count(inv.hash) ||
+	bool txInMap = false;
+	    {
+            LOCK(cs_mapTransactions);
+	    txInMap = (mapTransactions.count(inv.hash) != 0);
+	    }
+        return txInMap ||
               mapOrphanTransactions.count(inv.hash) ||
               txdb.ContainsTx(inv.hash);
        }