Fix a deadlock in WorkQueue::WorkerThreadProc

refs #8554

diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
index 427bbcae128bb74bde35ce74bd718fa579faa146..e8209fe981ad03793d96f5435675254f818f9476 100644 (file)
--- a/lib/base/workqueue.cpp
+++ b/lib/base/workqueue.cpp
@@ -220,6 +220,10 @@ void WorkQueue::WorkerThreadProc(void)
                                m_ExceptionCallback(boost::current_exception());
                }
 
+               /* clear the task so whatever other resources it holds are released
+                  _before_ we re-acquire the mutex */
+               task = Task();
+
                lock.lock();
 
                m_Processing--;