[jboss-cvs] JBossAS SVN: r84189 - branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/managed.

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

Author: scott.stark at jboss.org
Date: 2009-02-13 12:03:51 -0500 (Fri, 13 Feb 2009)
New Revision: 84189

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

Modified: branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-02-13 16:56:09 UTC (rev 84188)
+++ branches/Branch_5_x/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-02-13 17:03:51 UTC (rev 84189)
@@ -286,15 +286,15 @@
       }
    }
 
+   /**
+    * The service context uses the canonical object name string
+    * @return the service metadata canonical object name string
+    */
    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;
    }
 
    /**