[jboss-cvs] JBossAS SVN: r85231 - trunk/system-jmx/src/main/org/jboss/system/deployers/managed.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2009-03-04 10:24:41 -0500 (Wed, 04 Mar 2009)
New Revision: 85231

Modified:
   trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
Log:
port rev. 84189 - JBAS-5523, return the ServiceMetaData canonical object name string as the component name

Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-03-04 15:22:21 UTC (rev 85230)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-03-04 15:24:41 UTC (rev 85231)
@@ -151,7 +151,8 @@
             ObjectName mbean = md.getObjectName();
             try
             {
-               value = getMbeanServer().getAttribute(mbean, name);
+               if(getMbeanServer() != null)
+                  value = getMbeanServer().getAttribute(mbean, name);
             }
             catch (AttributeNotFoundException e)
             {
@@ -293,13 +294,9 @@
 
    public Object getComponentName(BeanInfo beanInfo, ManagedProperty property, ServiceMetaData md, MetaValue value)
    {
-      if (beanInfo == null || property == null || value == null)
-      {
-         ObjectName objectName = md.getObjectName();
-         if (objectName != null)
-            return objectName.getCanonicalName();
-      }
-      return null;
+      ObjectName objectName = md.getObjectName();
+      String canonicalName = objectName.getCanonicalName();
+      return canonicalName;
    }
 
    /**