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

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

Author: emuckenhuber
Date: 2009-05-07 10:19:24 -0400 (Thu, 07 May 2009)
New Revision: 88363

Modified:
   branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
Log:
[JBAS-6862] fix the BMD ManagedObject names.

Modified: branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java	2009-05-07 14:00:45 UTC (rev 88362)
+++ branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/KernelDeploymentManagedObjectCreator.java	2009-05-07 14:19:24 UTC (rev 88363)
@@ -168,7 +168,15 @@
                   {
                      // The component managed objects need to be in the root map
                      ManagedObject compMO = (ManagedObject) gv.getValue();
-                     managedObjects.put(compUnit.getName(), compMO);
+                     // Use the ManagedObject name if it's not the same as the attachmentName
+                     String managedObjectName = compUnit.getName();
+                     if(compMO.getAttachmentName() != null)
+                     {
+                        managedObjectName = compMO.getAttachmentName().equals(compMO.getName()) ?
+                              compUnit.getName() : compMO.getName();
+                     }
+                     // Add the managed object 
+                     managedObjects.put(managedObjectName, compMO);
                      // Add the bean MO to the beans list
                      tmpBeans.add(gv);
                   }