diff options
| author | Gordon Sim <gsim@apache.org> | 2013-08-16 22:15:06 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-08-16 22:15:06 +0000 |
| commit | dab5ad3eee40498b73beca790ccb4af76f6b42e6 (patch) | |
| tree | ba1e9bff0371c904cbda78c27a40cf2cbb9ce589 /cpp/src | |
| parent | edfced302aff6de1fe36b1dc8416e0dae2798a34 (diff) | |
| download | qpid-python-dab5ad3eee40498b73beca790ccb4af76f6b42e6.tar.gz | |
QPID-5078: ensure listeners are always notified if a message was left on the queue
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1514907 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/Queue.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 227acd1b56..e96ebd3701 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -393,6 +393,7 @@ bool Queue::getNextMessage(Message& m, Consumer::shared_ptr& c) if (!checkNotDeleted(c)) return false; QueueListeners::NotificationSet set; ScopedAutoDelete autodelete(*this); + bool messageFound(false); while (true) { //TODO: reduce lock scope Mutex::ScopedLock locker(messageLock); @@ -434,7 +435,8 @@ bool Queue::getNextMessage(Message& m, Consumer::shared_ptr& c) QPID_LOG(debug, "Message " << msg->getSequence() << " retrieved from '" << name << "'"); m = *msg; - return true; + messageFound = true; + break; } else { //message(s) are available but consumer hasn't got enough credit QPID_LOG(debug, "Consumer can't currently accept message from '" << name << "'"); @@ -456,11 +458,12 @@ bool Queue::getNextMessage(Message& m, Consumer::shared_ptr& c) } else { QPID_LOG(debug, "No messages to dispatch on queue '" << name << "'"); listeners.addListener(c); - return false; + break; } + } set.notify(); - return false; + return messageFound; } void Queue::removeListener(Consumer::shared_ptr c) |