From 55794fe07036dc437b9010fce0c71e4d0ff48454 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Fri, 17 Dec 2010 13:10:41 +0000
Subject: [PATCH] tidying up jmx test to behave better in CI environments

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1050372 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/broker/jmx/ManagementContext.java       |  2 +-
 .../usecases/DurableSubscriptionUnsubscribeTest.java | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
index 6a05b788ef..928a5def66 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
@@ -305,7 +305,7 @@ public class ManagementContext implements Service {
         return getMBeanServer().queryNames(name, query);
     }
     
-    public ObjectInstance getObjectInstance(ObjectName name) throws Exception {
+    public ObjectInstance getObjectInstance(ObjectName name) throws InstanceNotFoundException {
         return getMBeanServer().getObjectInstance(name);
     }
     
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
index dcb7334eea..10ff3e0e92 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.java
@@ -21,6 +21,9 @@ import org.apache.activemq.TestSupport;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.jmx.DurableSubscriptionViewMBean;
+import org.apache.activemq.broker.jmx.SubscriptionView;
+import org.apache.activemq.broker.jmx.SubscriptionViewMBean;
 import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.DurableTopicSubscription;
 import org.apache.activemq.broker.region.Subscription;
@@ -77,12 +80,12 @@ public class DurableSubscriptionUnsubscribeTest extends TestSupport {
             assertCount(100, 0);
         }
 
-        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         ObjectName[] subs = broker.getAdminView().getInactiveDurableTopicSubscribers();
 
         for (int i = 0; i < subs.length; i++) {
-            ObjectName sub = subs[i];
-            mbs.invoke(sub, "destroy", null, null);
+            ObjectName subName = subs[i];
+            DurableSubscriptionViewMBean sub = (DurableSubscriptionViewMBean)broker.getManagementContext().newProxyInstance(subName, DurableSubscriptionViewMBean.class, true);
+            sub.destroy();
 
             if (i % 20 == 0) {
                 Thread.sleep(1000);
@@ -226,12 +229,11 @@ public class DurableSubscriptionUnsubscribeTest extends TestSupport {
 
     private int countMBean() throws MalformedObjectNameException, InstanceNotFoundException {
         int count = 0;
-        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         for (int i = 0; i < 100; i++) {
             String name = "org.apache.activemq:BrokerName=" + getName() + ",Type=Subscription,active=false,name=" + getName() + "_SubsId" + i;
             ObjectName sub = new ObjectName(name);
             try {
-                ObjectInstance oi = mbs.getObjectInstance(sub);
+                broker.getManagementContext().getObjectInstance(sub);
                 count++;
             }
             catch (InstanceNotFoundException ignore) {