[jboss-cvs] JBossAS SVN: r72024 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: scott.stark at jboss.org
Date: 2008-04-11 10:13:32 -0400 (Fri, 11 Apr 2008)
New Revision: 72024

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
JBMETA-16, add check for home jndi name to determineJndiName

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-04-11 14:10:23 UTC (rev 72023)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-04-11 14:13:32 UTC (rev 72024)
@@ -628,13 +628,15 @@
     */
    public String determineJndiName()
    {
-      if (jndiName != null)
-         return jndiName;
-      
-      String mapped = getMappedName();
-      if (mapped != null)
-         return mapped;
-      return getEjbName();
+      String name = getHomeJndiName();
+      if (name == null)
+         name = jndiName;
+      if(name == null)
+         name = getMappedName();
+      // TODO: JBMETA-6, this should be the policy with ejb2 metadata defaulting to an ejb-name policy
+      if(name == null)
+         name = getEjbName();
+      return name;
    }
 
    @Override