You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/08/22 21:54:06 UTC

lucene-solr:branch_6_6: Make this test more robust by using our own MBeanServer.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6_6 d30ae8342 -> f4fb90886


Make this test more robust by using our own MBeanServer.


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

Branch: refs/heads/branch_6_6
Commit: f4fb90886690c829a062f4243a62825f810ad359
Parents: d30ae83
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Aug 22 23:53:41 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Aug 22 23:53:41 2017 +0200

----------------------------------------------------------------------
 .../src/test/org/apache/solr/core/TestJmxIntegration.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f4fb9088/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
index f841f92..1ac4d83 100644
--- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -29,11 +29,11 @@ import javax.management.AttributeNotFoundException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import java.lang.invoke.MethodHandles;
-import java.lang.management.ManagementFactory;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
@@ -49,6 +49,7 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private static MBeanServer mbeanServer = null;
+  private static MBeanServer newMbeanServer = null;
 
   @BeforeClass
   public static void beforeClass() throws Exception {
@@ -57,7 +58,7 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
     //
     // (test configs are setup to use existing server if any, 
     // otherwise skip JMX)
-    MBeanServer platformServer = ManagementFactory.getPlatformMBeanServer();
+    newMbeanServer = MBeanServerFactory.createMBeanServer();
 
     initCore("solrconfig.xml", "schema.xml");
 
@@ -84,6 +85,9 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
 
   @AfterClass
   public static void afterClass() throws Exception {
+    if (newMbeanServer != null) {
+      MBeanServerFactory.releaseMBeanServer(newMbeanServer);
+    }
     mbeanServer = null;
   }