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

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

Author: scott.stark at jboss.org
Date: 2009-04-22 09:33:29 -0400 (Wed, 22 Apr 2009)
New Revision: 87672

Modified:
   branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/TypedManagedDeploymentCreator.java
Log:
Work around null ManagedObjects showing up in the unitMOs

Modified: branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/TypedManagedDeploymentCreator.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/TypedManagedDeploymentCreator.java	2009-04-22 13:32:28 UTC (rev 87671)
+++ branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/TypedManagedDeploymentCreator.java	2009-04-22 13:33:29 UTC (rev 87672)
@@ -24,6 +24,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -54,7 +55,7 @@
  * @see {@link #addAttachmentType(Class, String)}
  * 
  * @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
  */
 public class TypedManagedDeploymentCreator
    implements ManagedDeploymentCreator
@@ -71,13 +72,16 @@
          Map<String, ManagedObject> unitMOs,
          ManagedDeployment parent)
    {
-      if(unit.getSimpleName().startsWith("testEjb2xDeployment"))
-         log.info("Processing testEjb2xDeployment");
-
       DeploymentPhase phase = unit.getAttachment(DeploymentPhase.class);
       ManagementDeployment mdAnnotation = null;
-      for(ManagedObject mo : unitMOs.values())
+      HashMap<String, ManagedObject> validUnitMOs = new HashMap<String, ManagedObject>();
+      for(String name : unitMOs.keySet())
       {
+         // TODO: why should there be null ManagedObjects?
+         ManagedObject mo = unitMOs.get(name);
+         if(mo == null)
+            continue;
+         validUnitMOs.put(name, mo);
          Map<String, Annotation> annotations = mo.getAnnotations();
          if(annotations != null && mdAnnotation == null)
             mdAnnotation = (ManagementDeployment) annotations.get(ManagementDeployment.class.getName());
@@ -96,7 +100,7 @@
       if( phase == null )
          phase = DeploymentPhase.APPLICATION;
       
-      ManagedDeployment md = new ManagedDeploymentImpl(unit.getName(), simpleName, phase, parent, unitMOs);
+      ManagedDeployment md = new ManagedDeploymentImpl(unit.getName(), simpleName, phase, parent, validUnitMOs);
       if(types.length > 0)
       {
          for(String type : types)