]> granicus.if.org Git - icinga2/commitdiff
Fix deadlock in WorkQueue::Join().
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 17 Oct 2013 13:49:53 +0000 (15:49 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 17 Oct 2013 13:49:53 +0000 (15:49 +0200)
lib/base/workqueue.cpp

index 6a6d25b24d679d7ebbb7df14a32f390709dd77b4..aabb9ed27a391a4e3b10d58bd4a7774f17622d95 100644 (file)
@@ -62,6 +62,8 @@ void WorkQueue::Join(void)
 {
        boost::mutex::scoped_lock lock(m_Mutex);
        m_Joined = true;
+       m_CV.notify_all();
+
        while (!m_Stopped)
                m_CV.wait(lock);
 }