Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A27081085C for ; Tue, 3 Sep 2013 08:23:08 +0000 (UTC) Received: (qmail 91989 invoked by uid 500); 3 Sep 2013 08:23:07 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 91946 invoked by uid 500); 3 Sep 2013 08:23:01 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 91934 invoked by uid 99); 3 Sep 2013 08:22:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Sep 2013 08:22:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9996E8BC6D6; Tue, 3 Sep 2013 08:22:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dejanb@apache.org To: commits@activemq.apache.org Message-Id: <51d609ccd24f473e90edf21fc407a057@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: https://issues.apache.org/jira/browse/AMQ-4711 - totalMessageCount stat is not decremented after destination removal Date: Tue, 3 Sep 2013 08:22:59 +0000 (UTC) Updated Branches: refs/heads/trunk 052577219 -> a0c1781c4 https://issues.apache.org/jira/browse/AMQ-4711 - totalMessageCount stat is not decremented after destination removal Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a0c1781c Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a0c1781c Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a0c1781c Branch: refs/heads/trunk Commit: a0c1781c4e909d35030d9762eaa70cf37639a569 Parents: 0525772 Author: Dejan Bosanac Authored: Mon Sep 2 16:19:03 2013 +0200 Committer: Dejan Bosanac Committed: Tue Sep 3 10:22:25 2013 +0200 ---------------------------------------------------------------------- .../activemq/management/CountStatisticImpl.java | 3 +++ .../apache/activemq/broker/jmx/MBeanTest.java | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/a0c1781c/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java ---------------------------------------------------------------------- diff --git a/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java index b88ba1c..bd5cd41 100755 --- a/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java +++ b/activemq-client/src/main/java/org/apache/activemq/management/CountStatisticImpl.java @@ -105,6 +105,9 @@ public class CountStatisticImpl extends StatisticImpl implements CountStatistic } public void setParent(CountStatisticImpl parent) { + if (this.parent != null) { + this.parent.subtract(this.getCount()); + } this.parent = parent; } http://git-wip-us.apache.org/repos/asf/activemq/blob/a0c1781c/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java index 2e3ae2c..1327dd2 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java @@ -189,6 +189,26 @@ public class MBeanTest extends EmbeddedBrokerTestSupport { } + public void testRemoveQueue() throws Exception { + String queueName = "TEST"; + ObjectName brokerName = assertRegisteredObjectName(domain + ":type=Broker,brokerName=localhost"); + BrokerViewMBean broker = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, brokerName, BrokerViewMBean.class, true); + broker.addQueue(queueName); + + ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + ":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + queueName); + + QueueViewMBean queue = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, QueueViewMBean.class, true); + queue.sendTextMessage("message 1"); + queue.sendTextMessage("message 2"); + + assertEquals(2, broker.getTotalMessageCount()); + + broker.removeQueue(queueName); + + assertEquals(0, broker.getTotalMessageCount()); + + } + public void testRetryMessages() throws Exception { // lets speed up redelivery ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory) connectionFactory;