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

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

Author: ALRubinger
Date: 2008-03-06 16:22:23 -0500 (Thu, 06 Mar 2008)
New Revision: 70517

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbRefMetaData.java
Log:
When getting JNDI name, first look to name resolved from ejb-link, then fall back on mapped-name

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbRefMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbRefMetaData.java	2008-03-06 21:14:00 UTC (rev 70516)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbRefMetaData.java	2008-03-06 21:22:23 UTC (rev 70517)
@@ -76,7 +76,11 @@
     */
    public String getJndiName()
    {
-      return getDelegate().getMappedName();
+      // Obtain JNDI name resolved from ejb-link
+      String resolvedJndiName = this.getDelegate().getResolvedJndiName();
+      // If specified, use resolved JNDI name, otherwise use explicit mappedName as usual
+      return (resolvedJndiName != null && !resolvedJndiName.equals("")) ? resolvedJndiName : this.getDelegate()
+            .getMappedName();
    }
 
    /**