1 files changed, 11 insertions, 9 deletions
diff --git a/cpp/src/qpid/sys/PollableQueue.h b/cpp/src/qpid/sys/PollableQueue.h
index 56c1d9e80a..7f11cc35a9 100644
--- a/cpp/src/qpid/sys/PollableQueue.h
+++ b/cpp/src/qpid/sys/PollableQueue.h
@@ -119,15 +119,17 @@ template <class T> void PollableQueue<T>::dispatch(sys::DispatchHandle& h) {
     ScopedLock l(lock);
     assert(dispatcher.id() == 0);
     dispatcher = Thread::current();
-    assert(batch.empty());
-    batch.swap(queue);
-    {
-        ScopedUnlock u(lock);   // Allow concurrent push to queue.
-        callback(batch);
-    }
-    if (!batch.empty()) {
-        queue.insert(queue.begin(), batch.begin(), batch.end()); // put back unprocessed items.
-        batch.clear();
+    while (!stopped && !queue.empty()) {
+        assert(batch.empty());
+        batch.swap(queue);
+        {
+            ScopedUnlock u(lock);   // Allow concurrent push to queue.
+            callback(batch);
+        }
+        if (!batch.empty()) {
+            queue.insert(queue.begin(), batch.begin(), batch.end()); // put back unprocessed items.
+            batch.clear();
+        }
     }
     dispatcher = Thread();
     if (queue.empty()) condition.clear();