From e25d09c79899b97c3b4b2a88d9afa826ae015349 Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Fri, 1 Aug 2008 06:44:48 +0000
Subject: [PATCH] Try all MBeanServers before giving up

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@681613 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/solr/core/TestJmxIntegration.java  | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/test/org/apache/solr/core/TestJmxIntegration.java b/src/test/org/apache/solr/core/TestJmxIntegration.java
index 019bc8db86e..8ba47f820ff 100644
--- a/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -60,7 +60,7 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
   @Test
   public void testJmxRegistration() throws Exception {
     List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
-    System.out.println("Servers: " + servers);
+    System.out.println("Servers in testJmxRegistration: " + servers);
     assertNotNull("MBeanServers were null", servers);
     assertFalse("No MBeanServer was found", servers.isEmpty());
 
@@ -82,12 +82,24 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
   @Test
   public void testJmxUpdate() throws Exception {
     List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
-    MBeanServer mbeanServer = servers.get(0);
+    System.out.println("Servers in testJmxUpdate: " + servers);
+    boolean found = false;
+    Set<ObjectInstance> objects = null;
+    MBeanServer mbeanServer = null;
 
-    Set<ObjectInstance> objects = mbeanServer.queryMBeans(null, Query.match(
-            Query.attr("numDocs"), Query.value("[0-9]")));
-    assertFalse("No MBean for SolrIndexSearcher found in MBeanServer", objects
-            .isEmpty());
+    for (MBeanServer server : servers) {
+      objects = server.queryMBeans(null, Query.match(
+              Query.attr("numDocs"), Query.value("*")));
+      if (!objects.isEmpty()) {
+        found = true;
+        mbeanServer = server;
+        break;
+      }
+    }
+
+    if (!found) {
+      assertFalse("No MBean for SolrIndexSearcher found in MBeanServer", objects.isEmpty());
+    }
 
     int oldNumDocs = Integer.valueOf((String) mbeanServer.getAttribute(objects
             .iterator().next().getObjectName(), "numDocs"));
@@ -96,7 +108,7 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
     assertU(commit());
 
     objects = mbeanServer.queryMBeans(null, Query.match(Query.attr("numDocs"),
-            Query.value("[0-9]")));
+            Query.value("*")));
     assertFalse("No MBean for SolrIndexSearcher found in MBeanServer", objects
             .isEmpty());
 
@@ -106,3 +118,4 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
             numDocs > oldNumDocs);
   }
 }
+