- Added OutputTask::hasOutput() test.

 - Cluster only sends doOutput events when hasOutput()


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@683416 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index ebb143a472..3b447e97f2 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -212,6 +212,11 @@ bool Queue::getNextMessage(QueuedMessage& m, Consumer& c)
     }
 }
 
+bool Queue::empty() const {
+    Mutex::ScopedLock locker(messageLock);
+    return messages.empty();
+}
+
 bool Queue::consumeNextMessage(QueuedMessage& m, Consumer& c)
 {
     while (true) {
@@ -348,7 +353,6 @@ void Queue::consume(Consumer& c, bool requestExclusive){
         }
     }
     consumerCount++;
-
     if (mgmtObject != 0)
         mgmtObject->inc_consumerCount ();
 }