[jboss-cvs] JBossAS SVN: r58288 - projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx

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

Author: bstansberry at jboss.com
Date: 2006-11-12 20:24:44 -0500 (Sun, 12 Nov 2006)
New Revision: 58288

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
Log:
Don't create ObjectName from bean name if annotation provides the name

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java	2006-11-13 00:15:11 UTC (rev 58287)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java	2006-11-13 01:24:44 UTC (rev 58288)
@@ -63,8 +63,7 @@
 
       JMX jmx = (JMX)invocation.resolveClassAnnotation(JMX.class);
       
-      String name = (String) context.getName();
-      ObjectName objectName = new ObjectName("test:name='" + name + "'");
+      ObjectName objectName = null;
       if (jmx != null)
       {
          String jmxName = jmx.name();
@@ -72,6 +71,13 @@
             objectName = new ObjectName(jmxName);
       }
       
+      if (objectName == null)
+      {
+         // try to build one from the bean name
+         String name = (String) context.getName();
+         objectName = new ObjectName("test:name='" + name + "'");
+      }
+      
       if (server == null)
       {
          throw new RuntimeException("No MBeanServer was injected");