QPID-2018: Updated AMQQueueMBean to make use of the AMQQueue clearQueue return value to report the number of messages deleted. Updated management console accordingly, also indicating that it is only non-acquired messaes that are cleared

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

1 files changed, 5 insertions, 2 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index e450a2060e..d340c9a91f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
@@ -307,13 +307,16 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
     }
 
     /**
+     * Clears the queue of non-acquired messages
+     * 
+     * @return the number of messages deleted
      * @see AMQQueue#clearQueue
      */
-    public void clearQueue() throws JMException
+    public Long clearQueue() throws JMException
     {
         try
         {
-            _queue.clearQueue(_storeContext);
+            return _queue.clearQueue(_storeContext);
         }
         catch (AMQException ex)
         {