diff options
| author | Alan Conway <aconway@apache.org> | 2008-12-17 17:14:14 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-12-17 17:14:14 +0000 |
| commit | 7032cd19ced20d2fa37de1263cc9dfa85592b668 (patch) | |
| tree | b0dbe9e7b625342124e6f8a89d904a9b00e4f267 /cpp/src/qpid/sys/PollableQueue.h | |
| parent | 6d2b17f95a259dde5fb3c75350cd1cfcdf7ad67b (diff) | |
| download | qpid-python-7032cd19ced20d2fa37de1263cc9dfa85592b668.tar.gz | |
Default --cluster-read-max to 0.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@727444 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/PollableQueue.h')
| -rw-r--r-- | cpp/src/qpid/sys/PollableQueue.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cpp/src/qpid/sys/PollableQueue.h b/cpp/src/qpid/sys/PollableQueue.h index 7f11cc35a9..56c1d9e80a 100644 --- a/cpp/src/qpid/sys/PollableQueue.h +++ b/cpp/src/qpid/sys/PollableQueue.h @@ -119,17 +119,15 @@ template <class T> void PollableQueue<T>::dispatch(sys::DispatchHandle& h) { ScopedLock l(lock); assert(dispatcher.id() == 0); dispatcher = Thread::current(); - 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(); - } + 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(); |
