Fix sendrawtransaction hang when sending a tx already in mempool

PastaPastaPasta · Nov 20, 2017 · d9340ce · d9340ce
1 parent 7293d06
commit d9340ce
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -970,6 +970,10 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
         }
     } else if (fHaveChain) {
         throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");
+    } else {
+        // Make sure we don't block forever if re-sending
+        // a transaction already in mempool.
+        promise.set_value();
     }
 
     } // cs_main