[jboss-cvs] JBossAS SVN: r70061 - trunk/webservices/src/main/org/jboss/wsf/container/jboss50.

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

Author: thomas.diesler at jboss.com
Date: 2008-02-25 08:31:43 -0500 (Mon, 25 Feb 2008)
New Revision: 70061

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
Log:
Prevent NPE with endoint API

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java	2008-02-25 12:28:35 UTC (rev 70060)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java	2008-02-25 13:31:43 UTC (rev 70061)
@@ -60,11 +60,16 @@
       {
          webMetaDataModifier.modifyMetaData(dep);
          
-         DeploymentUnit deployment = dep.getAttachment(DeploymentUnit.class);
-         deployment.addAttachment(JBossWebMetaData.class, jbwmd);
-
-         // Mark the deployment as generated web app so the JSE deployer hook can ignore it 
-         deployment.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+         DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
+         if (unit != null)
+         {
+            unit.addAttachment(JBossWebMetaData.class, jbwmd);
+            unit.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+         }
+         else
+         {
+            // TODO: endpoint API cannot use an existing deployment unit
+         }
       }
       catch (Exception ex)
       {