[jbossws-commits] JBossWS SVN: r8436 - container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2008-10-10 14:08:27 -0400 (Fri, 10 Oct 2008)
New Revision: 8436

Modified:
   container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
Log:
[JBWS-2194] Porting fix to this branch


Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-10-10 17:59:52 UTC (rev 8435)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-10-10 18:08:27 UTC (rev 8436)
@@ -27,6 +27,7 @@
 import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.javaee.JavaEEComponentHelper;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -96,7 +97,14 @@
                ObjectName objName = null;
                try
                {
-                  objName = new ObjectName(ejb.determineContainerName());
+                  String containerName = ejb.determineContainerName();
+                  if(containerName == null)
+                  {
+                     log.warn("Container name is null in metadata of " + ejb + ", will generate one.");
+                     String ejbName = ejb.getEjbName();
+                     containerName = JavaEEComponentHelper.createObjectName(ejb3Deployment, ejbName);
+                  }
+                  objName = new ObjectName(containerName);
                }
                catch (Exception e)
                {