svn commit: r1444084 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java

[mi...@apache.org]

Author: mikemccand
Date: Fri Feb  8 15:49:21 2013
New Revision: 1444084

URL: http://svn.apache.org/r1444084
Log:
SOLR-4418: workaround

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java?rev=1444084&r1=1444083&r2=1444084&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java Fri Feb  8 15:49:21 2013
@@ -16,18 +16,20 @@
  */
 package org.apache.solr.core;
 
+import java.lang.management.ManagementFactory;
+import java.util.*;
+import javax.management.*;
+
+import org.apache.lucene.util.Constants;
 import org.apache.solr.core.JmxMonitoredMap.SolrDynamicMBean;
 import org.apache.solr.util.AbstractSolrTestCase;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import javax.management.*;
-import java.lang.management.ManagementFactory;
-import java.util.*;
-
 /**
  * Test for JMX Integration
  *
@@ -80,6 +82,11 @@ public class TestJmxIntegration extends 
 
   @Test
   public void testJmxUpdate() throws Exception {
+
+    // Workaround for SOLR-4418 (this test fails with "No
+    // mbean found for SolrIndexSearcher" on IBM J9 6.0 and 7.0):
+    Assume.assumeTrue(!"IBM Corporation".equals(Constants.JVM_VENDOR));
+
     List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
     log.info("Servers in testJmxUpdate: " + servers);
     log.info(h.getCore().getInfoRegistry().toString());