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 22:07:26 UTC

lucene-solr:branch_7x: Release the correct server.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 4e7a9bef8 -> 9818b4b71


Release the correct server.


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

Branch: refs/heads/branch_7x
Commit: 9818b4b71631370508edd374fe4eb1336b2cf513
Parents: 4e7a9be
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Aug 23 00:06:58 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Aug 23 00:06:58 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9818b4b7/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 fff770c..31e5718 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