[rhq] modules/plugins

Heiko W. Rupp pilhuhn at fedoraproject.org
Tue Aug 14 19:41:20 UTC 2012


 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java |    8 +++++---
 modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml                                        |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit b86e772ba8569cc2084fac6e1b2a96f7422cc0e8
Author: Heiko W. Rupp <hwr at redhat.com>
Date:   Tue Aug 14 15:40:56 2012 -0400

    BZ 848030 - jmxName can be null, so act accordingly. Also put the jmxName into the connection properties of the created resource.

diff --git a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java
index 5d522de..5d907da 100644
--- a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java
+++ b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java
@@ -40,9 +40,9 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
 import org.rhq.plugins.jbossas5.ProfileServiceComponent;
 
 /**
- * 
+ *
  * @author Filip Drabek
- * 
+ *
  */
 public class JBossCacheDetailDiscoveryComponent implements
 		ResourceDiscoveryComponent<ProfileServiceComponent<?>> {
@@ -80,7 +80,7 @@ public class JBossCacheDetailDiscoveryComponent implements
 
 		String jmxName = defaultConfig.getSimple(CACHE_JMX_NAME).getStringValue();
 
-        beanName += (jmxName.equals("") ? "" : "," + jmxName);
+        beanName += ((jmxName==null || jmxName.equals("")) ? "" : "," + jmxName);
 
         // This is a singleton ResourceType, so we are only looking for a single MBean.
         EmsBean emsBean = connection.getBean(beanName);
@@ -94,6 +94,8 @@ public class JBossCacheDetailDiscoveryComponent implements
             conf.put(new PropertySimple(
                     JBossCacheDetailComponent.CACHE_DETAIL_BEAN_NAME,
                     beanName));
+            conf.put(new PropertySimple(CACHE_JMX_NAME, jmxName));
+
             resources.add(new DiscoveredResourceDetails(resourceType,
                     beanName, resourceType.getName(), "", "JBoss Cache",
                     conf, null));
diff --git a/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
index cba79cf..2572f54 100644
--- a/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml
@@ -31,7 +31,7 @@
                  singleton="true">
 
             <plugin-configuration>
-                <c:simple-property name="jmx-resource" default=""/>
+                <c:simple-property name="jmx-resource" default="" required="false"/>
             </plugin-configuration>
 
             <operation name="destroy" displayName="Destroy this cache."/>




More information about the rhq-commits mailing list