Avoid deadlocks when disposing recursive JobQueue::enter

...where the outer JobQueue::enter blocks on m_cndWait after it has been reset again due to m_lstJob.empty().

Avoid deadlocks when disposing recursive JobQueue::enter
...where the outer JobQueue::enter blocks on m_cndWait after it has been reset again due to m_lstJob.empty().
cba3ac1e · Stephan Bergmann · 739100d0 · cba3ac1e
Kaydet (Commit) cba3ac1e authored Şub 10, 2012 tarafından Stephan Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

jobqueue.cxx cppu/source/threadpool/jobqueue.cxx +5 -2

No files found.
--- a/cppu/source/threadpool/jobqueue.cxx
+++ b/cppu/source/threadpool/jobqueue.cxx
@@ -97,7 +97,9 @@ namespace cppu_threadpool {
                if( 0 == m_lstCallstack.front() )
                {
                    // disposed !
-                    if( m_lstJob.empty() )
+                    if( m_lstJob.empty()
+                        && (m_lstCallstack.empty()
+                            || m_lstCallstack.front() != 0) )
                    {
                        osl_resetCondition( m_cndWait );
                    }
@@ -110,7 +112,8 @@ namespace cppu_threadpool {
                    job = m_lstJob.front();
                    m_lstJob.pop_front();
                }
-                if( m_lstJob.empty() )
+                if( m_lstJob.empty()
+                    && (m_lstCallstack.empty() || m_lstCallstack.front() != 0) )
                {
                    osl_resetCondition( m_cndWait );
                }