From d8af3d27e9ad089c9fa52d0943c82da856102bb2 Mon Sep 17 00:00:00 2001
From: Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org>
Date: Mon, 5 Mar 2007 15:54:44 +0000
Subject: QPID-388 : hand merged the changes done in perftesting branch
 QPID-395 : hand merged the changes done in perftesting branch QPID-375 :
 default queue config properties should now be under <queues> tag

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@514703 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/etc/virtualhosts.xml                   | 10 +++++-----
 .../org/apache/qpid/server/queue/AMQQueue.java     |  6 +++++-
 .../apache/qpid/server/queue/AMQQueueMBean.java    | 23 ++--------------------
 3 files changed, 12 insertions(+), 27 deletions(-)

(limited to 'java/broker')

diff --git a/java/broker/etc/virtualhosts.xml b/java/broker/etc/virtualhosts.xml
index 52ff23e090..c6dedd6433 100644
--- a/java/broker/etc/virtualhosts.xml
+++ b/java/broker/etc/virtualhosts.xml
@@ -69,9 +69,9 @@
     <virtualhost>
         <name>development</name>
         <development>
-            <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-            <maximumMessageCount>5000</maximumMessageCount>
             <queues>
+                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                <maximumMessageCount>5000</maximumMessageCount>
                 <queue>
                     <name>queue</name>
                     <queue>
@@ -95,10 +95,10 @@
     </virtualhost>
         <virtualhost>
             <name>test</name>
-            <test>
-                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                <maximumMessageCount>5000</maximumMessageCount>
+            <test>                
                 <queues>
+                    <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                    <maximumMessageCount>5000</maximumMessageCount>
                     <queue>
                         <name>queue</name>
                         <queue>
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index 429829e201..5bbe1671a7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
@@ -632,7 +632,11 @@ public class AMQQueue implements Managable, Comparable
 
     protected void updateReceivedMessageCount(AMQMessage msg) throws AMQException
     {
-        _totalMessagesReceived.incrementAndGet();
+        if (!msg.isRedelivered())
+        {
+            _totalMessagesReceived.incrementAndGet();
+        }
+        
         try
         {
             _managedObject.checkForNotification(msg);
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index c9329a244c..254348dba0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
@@ -209,7 +209,8 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
 
     public Long getMaximumQueueDepth()
     {
-        return _queue.getMaximumQueueDepth();
+        long queueDepthInBytes = _queue.getMaximumQueueDepth();
+        return queueDepthInBytes >> 10 ;
     }
 
     public void setMaximumQueueDepth(Long value)
@@ -221,31 +222,11 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
      * returns the size of messages(KB) in the queue.
      */
     public Long getQueueDepth() throws JMException
-    {
-        return getQueueDepthKb();
-    }
-
-    public long getQueueDepthKb()
     {
         long queueBytesSize = _queue.getQueueDepth();
         return queueBytesSize >> 10 ;
     }
 
-    /**
-     * returns size of message in bytes
-     */
-    private long getMessageSize(AMQMessage msg) throws AMQException
-    {
-        if (msg == null)
-        {
-            return 0l;
-        }
-
-        return msg.getContentHeaderBody().bodySize;
-    }
-
-
-
     /**
      * Checks if there is any notification to be send to the listeners
      */
-- 
cgit v1.2.1