modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 15 ++++++---- 1 file changed, 9 insertions(+), 6 deletions(-)
New commits: commit 569559b37fee14bf17c2e20de872cf365c1428b9 Author: Ian Springer ian.springer@redhat.com Date: Fri May 25 10:35:32 2012 -0400
[BZ 802003] fix bug in original fix, which caused embedded JVM's to never get discovered (https://bugzilla.redhat.com/show_bug.cgi?id=802003)
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java index 9a5fb0d..bf456a1 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java @@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jetbrains.annotations.Nullable; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; @@ -77,15 +78,17 @@ public class EmbeddedJMXServerDiscoveryComponent implements ResourceDiscoveryCom return Collections.singleton(resourceDetails); }
+ @Nullable private EmsBean getRuntimeMXBean(ResourceDiscoveryContext<JMXComponent<?>> context) { EmsConnection emsConnection = context.getParentResourceComponent().getEmsConnection(); - EmsBean runtimeMBean; - if (emsConnection != null) { + if (emsConnection == null) { log.debug("Parent EMS connection is null for [" + context.getParentResourceContext().getResourceKey() + "] " - + context.getParentResourceContext().getResourceType() + " JVM."); - runtimeMBean = emsConnection.getBean(ManagementFactory.RUNTIME_MXBEAN_NAME); - } else { - runtimeMBean = null; + + context.getParentResourceContext().getResourceType() + " JVM."); + return null; + } + + EmsBean runtimeMBean = emsConnection.getBean(ManagementFactory.RUNTIME_MXBEAN_NAME); + if (runtimeMBean == null) { log.debug("MBean [" + ManagementFactory.RUNTIME_MXBEAN_NAME + "] not found for [" + context.getParentResourceContext().getResourceKey() + "] " + context.getParentResourceContext().getResourceType() + " JVM.");
rhq-commits@lists.fedorahosted.org