Patch from Gordon Sim to fix issues with hasOutput implementation.

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

1 files changed, 8 insertions, 4 deletions

diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index e35b3ef7ee..347fc5cf9d 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -107,6 +107,7 @@ namespace qpid {
 
             void notify();
             void removeListener(Consumer&);
+            void addListener(Consumer&);
 
             bool isExcluded(boost::intrusive_ptr<Message>& msg);
 
@@ -114,8 +115,6 @@ namespace qpid {
             void popAndDequeue();
 
         public:
-            // FIXME aconway 2008-08-06: was private, verify if needed public.
-            void addListener(Consumer&);
 
             virtual void notifyDurableIOComplete();
             typedef boost::shared_ptr<Queue> shared_ptr;
@@ -128,9 +127,14 @@ namespace qpid {
                   management::Manageable* parent = 0);
             ~Queue();
 
-            bool empty() const;
-            
             bool dispatch(Consumer&);
+            /**
+             * Check whether there would be a message available for
+             * dispatch to this consumer. If not, the consumer will be
+             * notified of events that may have changed this
+             * situation.
+             */
+            bool checkForMessages(Consumer&);
 
             void create(const qpid::framing::FieldTable& settings);
             void configure(const qpid::framing::FieldTable& settings);