Merge pull request #6688

131c23d Fix locking in GetTransaction. (Alex Morcos)

src/main.cpp

@@ -965,14 +965,13 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
 bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow)
 {
     CBlockIndex *pindexSlow = NULL;
-    {
+
     LOCK(cs_main);
-        {
+
     if (mempool.lookup(hash, txOut))
     {
         return true;
     }
-        }
 
     if (fTxIndex) {
         CDiskTxPos postx;
@@ -1006,7 +1005,6 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock
         if (nHeight > 0)
             pindexSlow = chainActive[nHeight];
     }
-    }
 
     if (pindexSlow) {
         CBlock block;