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

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

Author: alessio.soldano at jboss.com
Date: 2008-08-05 08:07:47 -0400 (Tue, 05 Aug 2008)
New Revision: 76656

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
Log:
[JBWS-2194] Fixing deployment for jaxrpc endpoints


Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-08-05 11:54:22 UTC (rev 76655)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-08-05 12:07:47 UTC (rev 76656)
@@ -27,7 +27,6 @@
 import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.annotation.SecurityDomain;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -91,17 +90,20 @@
          while(iterator.hasNext())
          {
             JBossEnterpriseBeanMetaData ejb = iterator.next();
-            ObjectName objName = null;
-            try
+            EJBContainer ejbContainer = null;
+            if (ejb3Deployment != null)
             {
-               objName = new ObjectName(ejb.determineContainerName());
+               ObjectName objName = null;
+               try
+               {
+                  objName = new ObjectName(ejb.determineContainerName());
+               }
+               catch (Exception e)
+               {
+                  throw new DeploymentException(e);
+               }
+               ejbContainer = (EJBContainer)ejb3Deployment.getContainer(objName);
             }
-            catch (Exception e)
-            {
-               throw new DeploymentException(e);
-            }
-            EJBContainer ejbContainer = ejb3Deployment != null ? (EJBContainer)ejb3Deployment.getContainer(objName) : null;
-            
             if(ejb.getEjbClass()!=null)
             	wsDeployment.getEndpoints().add( new WebServiceDeclarationAdapter(ejb, ejbContainer, unit.getClassLoader()) );
             else