[jboss-cvs] JBossAS SVN: r66485 - projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers.

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

Author: alesj
Date: 2007-10-26 06:57:39 -0400 (Fri, 26 Oct 2007)
New Revision: 66485

Modified:
   projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java
Log:
Possible NPE fix.

Modified: projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java	2007-10-26 10:24:38 UTC (rev 66484)
+++ projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java	2007-10-26 10:57:39 UTC (rev 66485)
@@ -51,12 +51,14 @@
    {
       if (deployment == null)
          throw new IllegalArgumentException("Null deployment");
+      if (metaData == null)
+         throw new IllegalArgumentException("Null metaData");
 
       boolean trace = log.isTraceEnabled();
       if (trace)
          log.trace("Populating deployment " + deployment.getName() + " metaData=" + metaData);
       
-      DeploymentContext result = null;
+      DeploymentContext result;
       try
       {
          result = createRootDeploymentContext(deployment);
@@ -77,11 +79,8 @@
       
       try
       {
-         if (metaData != null)
-         {
-            result.getTransientManagedObjects().addAttachment(StructureMetaData.class, metaData);
-            populateContext(result, metaData);
-         }
+         result.getTransientManagedObjects().addAttachment(StructureMetaData.class, metaData);
+         populateContext(result, metaData);
       }
       catch (Throwable t)
       {