Author: alessio.soldano(a)jboss.com Date: 2008-10-28 05:30:12 -0400 (Tue, 28 Oct 2008) New Revision: 8571 Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java Log: [JBAS-5968] Porting fix to prevent processing of entity beans in the webservice deployer (-r 80134) Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-28 09:28:22 UTC (rev 8570) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-28 09:30:12 UTC (rev 8571) @@ -88,19 +88,12 @@ { JBossEnterpriseBeanMetaData ejb = iterator.next(); EJBContainer ejbContainer = null; - if (ejb3Deployment != null) + if (ejb3Deployment != null && !ejb.isEntity()) { ObjectName objName = null; try { - 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); + objName = new ObjectName(ejb.determineContainerName()); } catch (Exception e) {