From 9a6ff623fe19c0f8a5f16f082022844a0a758403 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 19 Jun 2014 09:39:51 +0200 Subject: [PATCH] rpc: Add acceptors only when listening succeeded Rebased-From: 6afa493 Rebased-By: Wladimir J. van der Laan --- src/rpcserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 838d4dd1d..b8a195d34 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -602,7 +602,6 @@ void StartRPCThreads() try { boost::shared_ptr acceptor(new ip::tcp::acceptor(*rpc_io_service)); - rpc_acceptors.push_back(acceptor); acceptor->open(endpoint.protocol()); acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); @@ -614,6 +613,7 @@ void StartRPCThreads() RPCListen(acceptor, *rpc_ssl_context, fUseSSL); + rpc_acceptors.push_back(acceptor); fListening = true; } catch(boost::system::system_error &e) @@ -628,7 +628,6 @@ void StartRPCThreads() endpoint.address(bindAddress); boost::shared_ptr acceptor(new ip::tcp::acceptor(*rpc_io_service)); - rpc_acceptors.push_back(acceptor); acceptor->open(endpoint.protocol()); acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); acceptor->bind(endpoint); @@ -636,6 +635,7 @@ void StartRPCThreads() RPCListen(acceptor, *rpc_ssl_context, fUseSSL); + rpc_acceptors.push_back(acceptor); fListening = true; } }