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 12A5310548 for ; Wed, 12 Mar 2014 02:21:59 +0000 (UTC) Received: (qmail 64407 invoked by uid 500); 12 Mar 2014 02:21:41 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 64015 invoked by uid 500); 12 Mar 2014 02:21:32 -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 63906 invoked by uid 99); 12 Mar 2014 02:21:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 02:21:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9F3A94110B; Wed, 12 Mar 2014 02:21:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hadrian@apache.org To: commits@activemq.apache.org Date: Wed, 12 Mar 2014 02:21:37 -0000 Message-Id: <05c324d2878f4b67bb63b929fdd3d7bc@git.apache.org> In-Reply-To: <0dfdd7129b6349acad365bd8656f4f07@git.apache.org> References: <0dfdd7129b6349acad365bd8656f4f07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/20] git commit: Only register the leveldb store MBeans in JMX if jmx is enabled on the broker. Only register the leveldb store MBeans in JMX if jmx is enabled on the broker. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/251b7da5 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/251b7da5 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/251b7da5 Branch: refs/heads/activemq-5.9 Commit: 251b7da5a865137244b321f80622138d2bb548ef Parents: 7fd082a Author: Hiram Chirino Authored: Wed Oct 30 15:34:29 2013 -0400 Committer: Hadrian Zbarcea Committed: Tue Mar 11 21:16:39 2014 -0400 ---------------------------------------------------------------------- .../main/scala/org/apache/activemq/leveldb/LevelDBStore.scala | 4 ++-- .../activemq/leveldb/replicated/ElectingLevelDBStore.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/251b7da5/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala index 98aaf6d..7f5b534 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala @@ -217,7 +217,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P debug("starting") // Expose a JMX bean to expose the status of the store. - if(brokerService!=null){ + if(brokerService!=null && brokerService.isUseJmx){ try { AnnotatedMBean.registerMBean(brokerService.getManagementContext, new LevelDBStoreView(this), objectName) } catch { @@ -274,7 +274,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P def doStop(stopper: ServiceStopper): Unit = { db.stop - if(brokerService!=null){ + if(brokerService!=null && brokerService.isUseJmx){ brokerService.getManagementContext().unregisterMBean(objectName); } info("Stopped "+this) http://git-wip-us.apache.org/repos/asf/activemq/blob/251b7da5/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala index 074eb7b..90e80c0 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala @@ -156,7 +156,7 @@ class ElectingLevelDBStore extends ProxyLevelDBStore { def init() { - if(brokerService!=null){ + if(brokerService!=null && brokerService.isUseJmx){ try { AnnotatedMBean.registerMBean(brokerService.getManagementContext, new ReplicatedLevelDBStoreView(this), objectName) } catch { @@ -269,7 +269,7 @@ class ElectingLevelDBStore extends ProxyLevelDBStore { } protected def doStop(stopper: ServiceStopper) { - if(brokerService!=null){ + if(brokerService!=null && brokerService.isUseJmx){ brokerService.getManagementContext().unregisterMBean(objectName); } zk_group.close