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

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

Author: alex.loubyansky at jboss.com
Date: 2008-03-18 19:03:43 -0400 (Tue, 18 Mar 2008)
New Revision: 70971

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbLocalRefMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbRefMetaData.java
Log:
JBMETA-8

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbLocalRefMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbLocalRefMetaData.java	2008-03-18 22:08:18 UTC (rev 70970)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbLocalRefMetaData.java	2008-03-18 23:03:43 UTC (rev 70971)
@@ -76,7 +76,12 @@
     */
    public String getJndiName()
    {
-      return getDelegate().getMappedName();
+      String jndiName = getDelegate().getResolvedJndiName();
+      // this fallback to mapped/jndi-name should affect only local tests?
+      // the AS tests pass without it
+      if(jndiName == null)
+         jndiName = getDelegate().getMappedName();
+      return jndiName;
    }
 
    /**

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-18 22:08:18 UTC (rev 70970)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/EjbRefMetaData.java	2008-03-18 23:03:43 UTC (rev 70971)
@@ -76,7 +76,12 @@
     */
    public String getJndiName()
    {
-      return getDelegate().getMappedName();
+      String jndiName = getDelegate().getResolvedJndiName();
+      // this fallback to mapped/jndi-name seems to affect only local tests
+      // the AS tests pass without it
+      if(jndiName == null)
+         jndiName = getDelegate().getMappedName();
+      return jndiName;
    }
 
    /**