activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4930 - need to track paged in for queue count to match stat view - thanks MBeanTest and JmsQueueBrowserTest
Date Fri, 08 Aug 2014 20:43:19 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk c391321d1 -> f158e7da6


https://issues.apache.org/jira/browse/AMQ-4930 - need to track paged in for queue count to
match stat view - thanks MBeanTest and JmsQueueBrowserTest


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f158e7da
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f158e7da
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f158e7da

Branch: refs/heads/trunk
Commit: f158e7da6752e4a48b12547ad09f1ae90a0d452d
Parents: c391321
Author: gtully <gary.tully@gmail.com>
Authored: Fri Aug 8 15:33:11 2014 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Aug 8 21:42:44 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/broker/region/Queue.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f158e7da/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 3cdd91c..af7cfe9 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1232,10 +1232,10 @@ public class Queue extends BaseDestination implements Task, UsageListener
{
         } finally {
             pagedInMessagesLock.readLock().unlock();
         }
-        int messagesInQueue = 0;
+        int messagesInQueue = alreadyPagedIn;
         messagesLock.readLock().lock();
         try {
-            messagesInQueue = messages.size();
+            messagesInQueue += messages.size();
         } finally {
             messagesLock.readLock().unlock();
         }


Mime
View raw message