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

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

Author: wolfc
Date: 2008-09-17 02:53:44 -0400 (Wed, 17 Sep 2008)
New Revision: 78634

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
Log:
JBAS-5968: bypass the NPE

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-09-17 06:53:18 UTC (rev 78633)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-09-17 06:53:44 UTC (rev 78634)
@@ -21,30 +21,27 @@
  */
 package org.jboss.wsf.container.jboss50.deployer;
 
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.management.ObjectName;
+
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.ejb.deployers.EjbDeployment;
 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.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.PortComponent;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
 import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
-import org.jboss.wsf.spi.metadata.j2ee.PortComponentMD;
-import org.jboss.wsf.spi.metadata.j2ee.PortComponentSpec;
-import org.jboss.logging.Logger;
 
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.management.ObjectName;
-
 /**
  * This web service deployer for EJB. Adopts EJB deployments to
  * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration} an passes it to a chain of
@@ -96,7 +93,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)
                {