pocoproject#2746: Fix race condition on TCPServerDispatcher stop

villytiger · Dec 24, 2020 · 688405a · 688405a
1 parent 3fc3e5f
commit 688405a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Net/src/TCPServerDispatcher.cpp b/Net/src/TCPServerDispatcher.cpp
@@ -50,6 +50,10 @@ class TCPConnectionNotification: public Notification
 };
 
 
+class StopNotification: public Notification {
+};
+
+
 TCPServerDispatcher::TCPServerDispatcher(TCPServerConnectionFactory::Ptr pFactory, Poco::ThreadPool& threadPool, TCPServerParams::Ptr pParams):
 	_rc(1),
 	_pParams(pParams),
@@ -166,9 +170,10 @@ void TCPServerDispatcher::enqueue(const StreamSocket& socket)
 
 void TCPServerDispatcher::stop()
 {
+	FastMutex::ScopedLock lock(_mutex);
 	_stopped = true;
 	_queue.clear();
-	_queue.wakeUpAll();
+	_queue.enqueueNotification(new StopNotification);
 }