From 33796149002db7c4fd10fc19d58ec2fb86ac952b Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 17 Dec 2008 17:23:48 +0000 Subject: Revert accidental commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@727447 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/PollableQueue.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'cpp/src') 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 void PollableQueue::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(); -- cgit v1.2.1