Merge pull request #21684 from Dr15Jones/fixTaskQueues

Simple fixes for task queues
cms-sw · Dec 12, 2017 · 0a49f60 · 0a49f60
2 parents ef598b6 + 92065f6
commit 0a49f60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/FWCore/Concurrency/interface/LimitedTaskQueue.h b/FWCore/Concurrency/interface/LimitedTaskQueue.h
@@ -98,7 +98,9 @@ namespace edm {
 
          bool resume() {
             if(m_queue) {
-               return m_queue->resume();
+               auto q = m_queue;
+               m_queue = nullptr;
+               return q->resume();
             }
             return false;
          }

diff --git a/FWCore/Concurrency/interface/SerialTaskQueue.h b/FWCore/Concurrency/interface/SerialTaskQueue.h
@@ -77,7 +77,7 @@ namespace edm {
       /**\return true if the queue is paused
        * \sa pause(), resume()
        */
-      bool isPaused() const { return m_pauseCount.load()==0;}
+      bool isPaused() const { return m_pauseCount.load()!=0;}
 
       // ---------- member functions ---------------------------
       /// Pauses processing of additional tasks from the queue.