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

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

Author: ALRubinger
Date: 2008-11-10 22:48:05 -0500 (Mon, 10 Nov 2008)
New Revision: 80783

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
Log:
[JBMETA-144] JBossSessionPolicyDecorator must check both mapped-name and jndi-name for explicit values before determining via a JNDI Policy

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-11-11 03:45:51 UTC (rev 80782)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-11-11 03:48:05 UTC (rev 80783)
@@ -355,10 +355,17 @@
          }
       }
       
+      // Try the mapped-name
       String s = delegate.getMappedName();
       if (s != null && s.length() > 0)
          return s;
       
+      // Try explicit jndi-name
+      s = delegate.getJndiName();
+      if (s != null && s.length() > 0)
+         return s;
+      
+      // Delegate out to the policy; not explicitly-defined here
       return getJndiPolicy().getJndiName(getEjbDeploymentSummary(), KnownInterfaces.REMOTE, KnownInterfaceType.BUSINESS_REMOTE);
    }