[jboss-cvs] JBossAS SVN: r72781 - trunk/server/src/main/org/jboss/deployment.

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

Author: scott.stark at jboss.org
Date: 2008-04-28 08:27:10 -0400 (Mon, 28 Apr 2008)
New Revision: 72781

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
Fix NPE on entity jndi name determination

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-28 11:54:00 UTC (rev 72780)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-28 12:27:10 UTC (rev 72781)
@@ -42,6 +42,7 @@
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -778,6 +779,7 @@
       }
       else
       {
+         // TODO, this is a mess that should be simply from the metadata
          ClassLoader loader = unit.getClassLoader();
          EjbDeploymentSummary unitSummary = getUnitSummary(unit, beanMD);
          Class<? extends DefaultJndiBindingPolicy> defaultPolicyClass = null;
@@ -806,14 +808,19 @@
                else if(sbeanMD.getLocal() != null)
                   jndiName = policy.getDefaultLocalJndiName(unitSummary);
             }
-            else
+            else if(policy != null)
             {
                jndiName = policy.getJndiName(unitSummary);
             }
+            else if(beanMD.isEntity())
+            {
+               JBossEntityBeanMetaData ebeanMD = (JBossEntityBeanMetaData) beanMD;
+               jndiName = ebeanMD.determineJndiName();
+            }
          }
          catch(Exception e)
          {
-            log.warn("Failed to obtain jndi name for bean: "+beanMD.getEjbName());
+            log.warn("Failed to obtain jndi name for bean: "+beanMD.getEjbName(), e);
             jndiName = beanMD.getEjbName();
          }
       }