summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-01-18 22:08:13 +0000
committerAlan Conway <aconway@apache.org>2012-01-18 22:08:13 +0000
commit42ae338aad7fa75221c8dea3e07d1d1dd53531f1 (patch)
tree5311f0941f479067e4e29204cd98fb744e5bc8b1 /cpp/src
parent6654157b96dae2752ba0bdd9117849f9647b86c4 (diff)
downloadqpid-python-42ae338aad7fa75221c8dea3e07d1d1dd53531f1.tar.gz
QPID-3603: Ensure listeners are notified of available messages even when a consumer also exists (note that replicating browser sees acquired messages)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1233082 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/QueueListeners.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/cpp/src/qpid/broker/QueueListeners.cpp b/cpp/src/qpid/broker/QueueListeners.cpp
index 591f4443bb..32c208b073 100644
--- a/cpp/src/qpid/broker/QueueListeners.cpp
+++ b/cpp/src/qpid/broker/QueueListeners.cpp
@@ -54,13 +54,12 @@ void QueueListeners::populate(NotificationSet& set)
set.consumer = consumers.front();
consumers.pop_front();
set.consumer->inListeners = false;
- } else {
- // Don't swap the deques, hang on to the memory allocated.
- set.browsers = browsers;
- browsers.clear();
- for (Listeners::iterator i = set.browsers.begin(); i != set.browsers.end(); i++)
- (*i)->inListeners = false;
}
+ // Don't swap the deques, hang on to the memory allocated.
+ set.browsers = browsers;
+ browsers.clear();
+ for (Listeners::iterator i = set.browsers.begin(); i != set.browsers.end(); i++)
+ (*i)->inListeners = false;
}
void QueueListeners::add(Listeners& listeners, Consumer::shared_ptr c)
@@ -77,7 +76,7 @@ void QueueListeners::remove(Listeners& listeners, Consumer::shared_ptr c)
void QueueListeners::NotificationSet::notify()
{
if (consumer) consumer->notify();
- else std::for_each(browsers.begin(), browsers.end(), boost::mem_fn(&Consumer::notify));
+ std::for_each(browsers.begin(), browsers.end(), boost::mem_fn(&Consumer::notify));
}
bool QueueListeners::contains(Consumer::shared_ptr c) const {