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

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

Author: heiko.braun at jboss.com
Date: 2008-05-07 06:46:28 -0400 (Wed, 07 May 2008)
New Revision: 73104

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
Log:
Fix NPE in JAXRPC deployment

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java	2008-05-07 09:37:49 UTC (rev 73103)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java	2008-05-07 10:46:28 UTC (rev 73104)
@@ -32,6 +32,7 @@
 import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.ejb3.Ejb3Deployment;
 
 import java.net.URL;
 
@@ -86,7 +87,7 @@
          }
          
          // EJB3 endpoints
-         else if (unit.getAttachment(WebServiceDeployment.class) != null)
+         else if (unit.getAttachment(Ejb3Deployment.class) != null)
          {
             EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit);
             if (ejbMetaData != null)

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java	2008-05-07 09:37:49 UTC (rev 73103)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java	2008-05-07 10:46:28 UTC (rev 73104)
@@ -36,6 +36,7 @@
 import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
 
 /**
  * A deployer JAXRPC EJB21 Endpoints
@@ -70,9 +71,14 @@
       if (wsMetaData == null)
          throw new IllegalStateException("Deployment unit does not contain webservices meta data");
 
+      WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
+      if (webServiceDeployment == null)
+         throw new IllegalStateException("Deployment unit does not contain webServiceDeployment");
+
       // Copy the attachments
       dep.addAttachment(WebservicesMetaData.class, wsMetaData);
       dep.addAttachment(JBossMetaData.class, jbmd);
+      dep.addAttachment(WebServiceDeployment.class, webServiceDeployment);      
 
       for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
       {
@@ -103,4 +109,4 @@
       WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
       return wsMetaData != null && unit.getAllMetaData(JBossMetaData.class).size() > 0;
    }
-}
\ No newline at end of file
+}