Fix RPC shutdown in acceptor loop (#1426)

nanocurrency · Dec 5, 2018 · ad9479e · ad9479e
1 parent 7a1d527
commit ad9479e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/rai/node/rpc.cpp b/rai/node/rpc.cpp
@@ -155,8 +155,10 @@ void rai::rpc::accept ()
 {
 	auto connection (std::make_shared<rai::rpc_connection> (node, *this));
 	acceptor.async_accept (connection->socket, [this, connection](boost::system::error_code const & ec) {
-		accept ();
-
+		if (acceptor.is_open ())
+		{
+			accept ();
+		}
 		if (!ec)
 		{
 			connection->parse_connection ();

diff --git a/rai/node/rpc_secure.cpp b/rai/node/rpc_secure.cpp
@@ -97,8 +97,10 @@ void rai::rpc_secure::accept ()
 {
 	auto connection (std::make_shared<rai::rpc_connection_secure> (node, *this));
 	acceptor.async_accept (connection->socket, [this, connection](boost::system::error_code const & ec) {
-		accept ();
-
+		if (acceptor.is_open ())
+		{
+			accept ();
+		}
 		if (!ec)
 		{
 			connection->parse_connection ();