QPID-852 : Updated broker so that it closes consumers when there are no messages on the queue

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637067 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 1 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index b04f60b1b0..17b4fa5d65 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -349,7 +349,14 @@ public class AMQChannel
         return tag;
     }
 
-    public void unsubscribeConsumer(AMQProtocolSession session, AMQShortString consumerTag) throws AMQException
+    /**
+     * Unsubscribe a consumer from a queue.
+     * @param session
+     * @param consumerTag
+     * @return true if the consumerTag had a mapped queue that could be unregistered.
+     * @throws AMQException
+     */
+    public boolean unsubscribeConsumer(AMQProtocolSession session, AMQShortString consumerTag) throws AMQException
     {
         if (_log.isDebugEnabled())
         {
@@ -374,7 +381,9 @@ public class AMQChannel
         if (q != null)
         {
             q.unregisterProtocolSession(session, _channelId, consumerTag);
+            return true;
         }
+        return false;
     }
 
     /**