QPID-2379: add ConsumerCountHigh to Queue delegate

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

4 files changed, 23 insertions, 3 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 33847683bb..3e155e104c 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
@@ -981,8 +981,7 @@ public class QMFService implements ConfigStore.ConfigEventListener
 
         public Long getConsumerCountHigh()
         {
-            // TODO
-            return 0l;
+            return (long) _obj.getConsumerCountHigh();
         }
 
         public Long getConsumerCountLow()
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
index a451091fee..8a5559c155 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
@@ -45,6 +45,8 @@ public interface QueueConfig extends ConfiguredObject<QueueConfigType, QueueConf
     long getQueueDepth();
 
     int getConsumerCount();
+    
+    int getConsumerCountHigh();
 
     int getBindingCount();
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index d25d73b383..c64b9047de 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -119,8 +119,9 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
     private final AtomicLong _enqueueSize = new AtomicLong();
     private final AtomicLong _persistentMessageEnqueueSize = new AtomicLong();
     private final AtomicLong _persistentMessageDequeueSize = new AtomicLong();
-    private final AtomicLong _persistentMessageEnqueueCount = new AtomicLong();;
+    private final AtomicLong _persistentMessageEnqueueCount = new AtomicLong();
     private final AtomicLong _persistentMessageDequeueCount = new AtomicLong();
+    private final AtomicInteger _counsumerCountHigh = new AtomicInteger(0);
 
     private final AtomicInteger _bindingCountHigh = new AtomicInteger();
 
@@ -406,6 +407,14 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
                 subscription.setNoLocal(_nolocal);
             }
             _subscriptionList.add(subscription);
+            
+            //Increment consumerCountHigh if necessary. (un)registerSubscription are both
+            //synchronized methods so we don't need additional synchronization here
+            if(_counsumerCountHigh.get() < getConsumerCount())
+            {
+                _counsumerCountHigh.incrementAndGet();
+            }
+            
             if (isDeleted())
             {
                 subscription.queueDeleted(this);
@@ -801,6 +810,11 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
     {
         return _subscriptionList.size();
     }
+    
+    public int getConsumerCountHigh()
+    {
+        return _counsumerCountHigh.get();
+    }
 
     public int getActiveConsumerCount()
     {
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 10a828d07c..1a2bcd87c5 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -547,4 +547,9 @@ public class MockAMQQueue implements AMQQueue
     {
         return false;
     }
+
+    public int getConsumerCountHigh()
+    {
+        return 0;
+    }
 }