[jbossws-commits] JBossWS SVN: r7722 - container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-06-20 08:07:28 -0400 (Fri, 20 Jun 2008)
New Revision: 7722

Modified:
   container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
Log:
[JBAS-5257] Cannot deploy through jax-ws endpoint API

Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java	2008-06-20 11:59:16 UTC (rev 7721)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java	2008-06-20 12:07:28 UTC (rev 7722)
@@ -23,6 +23,7 @@
 
 // $Id$
 
+import org.jboss.deployers.client.spi.DeploymentFactory;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -60,21 +61,25 @@
          throw new IllegalArgumentException("Web meta data is cannot be null");
 
       DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
-      if (unit == null)
-         throw new IllegalStateException("Cannot obtain deployment unit");
-
-      try
+      if (unit != null)
       {
-         webMetaDataModifier.modifyMetaData(dep);
-      
-         // Attaching it to the DeploymentUnit will cause a new webapp deployment
-         unit.addAttachment(JBossWebMetaData.class, jbwmd);
-         unit.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+         try
+         {
+            webMetaDataModifier.modifyMetaData(dep);
+         
+            // Attaching it to the DeploymentUnit will cause a new webapp deployment
+            unit.addAttachment(JBossWebMetaData.class, jbwmd);
+            unit.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
 
+         }
+         catch (Exception ex)
+         {
+            WSFDeploymentException.rethrow(ex);
+         }
       }
-      catch (Exception ex)
+      else
       {
-         WSFDeploymentException.rethrow(ex);
+         throw new IllegalStateException("Cannot obtain deployment unit");
       }
 
       return unit;