From 7c8fbacae6ce989e97023034a3f98cf6762a6571 Mon Sep 17 00:00:00 2001 From: Andrzej Bialecki Date: Wed, 23 Aug 2017 00:06:58 +0200 Subject: [PATCH] Release the correct server. --- .../src/test/org/apache/solr/core/TestJmxIntegration.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 fff770c858e..31e5718637f 100644 --- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java +++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java @@ -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; private static JmxObjectNameFactory nameFactory = null; private static String registryName = null; @@ -59,7 +60,7 @@ public class TestJmxIntegration extends AbstractSolrTestCase { // // (test configs are setup to use existing server if any, // otherwise skip JMX) - MBeanServer newMbeanServer = MBeanServerFactory.createMBeanServer(); + newMbeanServer = MBeanServerFactory.createMBeanServer(); initCore("solrconfig.xml", "schema.xml"); @@ -91,9 +92,10 @@ public class TestJmxIntegration extends AbstractSolrTestCase { @AfterClass public static void afterClass() throws Exception { - if (mbeanServer != null) { - MBeanServerFactory.releaseMBeanServer(mbeanServer); + if (newMbeanServer != null) { + MBeanServerFactory.releaseMBeanServer(newMbeanServer); } + mbeanServer = null; } @Test