[jboss-cvs] JBossAS SVN: r93820 - trunk/server/src/main/org/jboss/web/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-09-21 15:17:40 -0400 (Mon, 21 Sep 2009)
New Revision: 93820

Modified:
   trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
Log:
- Should fix NPE, possibly when there's no web.xml.

Modified: trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-09-21 18:55:04 UTC (rev 93819)
+++ trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-09-21 19:17:40 UTC (rev 93820)
@@ -358,7 +358,7 @@
             WebMetaData annotatedMetaData = unit.getAttachment(key, WebMetaData.class);
             if (!webFragmentMetaData.isMetadataComplete() && annotatedMetaData != null)
             {
-               // TODO: Merge annotation corresponding to the JAR
+               // Merge annotation corresponding to the JAR
                AnnotationMergedView.merge(webJarMetaData, webFragmentMetaData, annotatedMetaData);
             }
             else
@@ -375,6 +375,8 @@
                DeploymentException.rethrowAsDeploymentException("Deployment error processing fragment for JAR: " + jar, e);
             }
          }
+         if (specMetaData == null)
+            specMetaData = new WebMetaData();
          specMetaData.augment(mergedFragmentMetaData, null, true);
       }