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

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

Author: ALRubinger
Date: 2008-07-12 15:17:00 -0400 (Sat, 12 Jul 2008)
New Revision: 75733

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
Log:
[JBMETA-68] determineResolvedRemoteBusinessDefaultJndiName to delegate entirely to getMappedName

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-07-12 15:54:45 UTC (rev 75732)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-07-12 19:17:00 UTC (rev 75733)
@@ -279,19 +279,7 @@
     * @return
     */
    public String determineResolvedRemoteBusinessDefaultJndiName(){
-      // Obtain remote bindings
-      List<RemoteBindingMetaData> bindings = this.delegate.getRemoteBindings();
       
-      // If defined, use the first remote binding as a JNDI default
-      if (bindings != null && bindings.size() > 0)
-      {
-         String jndiName = bindings.get(0).getJndiName();
-         if (jndiName != null && jndiName.length() > 0)
-         {
-            return jndiName;
-         }
-      }
-      
       // Fall back on the mapped name
       return this.getMappedName();
    }
@@ -317,6 +305,19 @@
    @Override
    public String getMappedName()
    {
+      // Obtain remote bindings
+      List<RemoteBindingMetaData> bindings = this.delegate.getRemoteBindings();
+      
+      // If defined, use the first remote binding as a JNDI default
+      if (bindings != null && bindings.size() > 0)
+      {
+         String jndiName = bindings.get(0).getJndiName();
+         if (jndiName != null && jndiName.length() > 0)
+         {
+            return jndiName;
+         }
+      }
+      
       String s = delegate.getMappedName();
       if (s != null && s.length() > 0)
          return s;