From 8b183eea3238cc2f25cf62e63d724a2d2d361ee7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 May 2017 23:04:44 +0100 Subject: Fix hang in client_server tests. --- src/lib/server.cc | 8 +++++++- src/lib/server.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/server.cc b/src/lib/server.cc index 1fb3d7d47..722b1c811 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -40,7 +40,7 @@ Server::~Server () } _acceptor.close (); - _io_service.stop (); + stop (); } void @@ -74,3 +74,9 @@ Server::handle_accept (shared_ptr socket, boost::system::error_code cons handle (socket); start_accept (); } + +void +Server::stop () +{ + _io_service.stop (); +} diff --git a/src/lib/server.h b/src/lib/server.h index a72d36026..747c516a2 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -35,6 +35,7 @@ public: virtual ~Server (); virtual void run (); + void stop (); protected: boost::mutex _mutex; -- cgit v1.2.3