[jboss-cvs] JBossAS SVN: r72806 - trunk/server/src/main/org/jboss/deployment.

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

Author: scott.stark at jboss.org
Date: 2008-04-28 21:23:53 -0400 (Mon, 28 Apr 2008)
New Revision: 72806

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
Look to the jndi name before the jndi policy

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-29 01:22:42 UTC (rev 72805)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-29 01:23:53 UTC (rev 72806)
@@ -798,18 +798,22 @@
             if(beanMD.isSession())
             {
                JBossSessionBeanMetaData sbeanMD = (JBossSessionBeanMetaData) beanMD;
-               if(sbeanMD.getBusinessRemotes() != null && sbeanMD.getBusinessRemotes().size() > 0)
-                  jndiName = policy.getDefaultRemoteJndiName(unitSummary);
-               else if(sbeanMD.getHome() != null)
-                  jndiName = policy.getDefaultRemoteHomeJndiName(unitSummary);
-               else if(sbeanMD.getRemote() != null)
-                  jndiName = policy.getDefaultRemoteJndiName(unitSummary);
-               else if(sbeanMD.getLocalHome() != null)
-                  jndiName = policy.getDefaultLocalHomeJndiName(unitSummary);
-               else if(sbeanMD.getLocal() != null)
-                  jndiName = policy.getDefaultLocalJndiName(unitSummary);
-               else
-                  jndiName = policy.getJndiName(unitSummary);
+               jndiName = sbeanMD.getJndiName();
+               if(jndiName == null)
+               {
+                  if(sbeanMD.getBusinessRemotes() != null && sbeanMD.getBusinessRemotes().size() > 0)
+                     jndiName = policy.getDefaultRemoteJndiName(unitSummary);
+                  else if(sbeanMD.getHome() != null)
+                     jndiName = policy.getDefaultRemoteHomeJndiName(unitSummary);
+                  else if(sbeanMD.getRemote() != null)
+                     jndiName = policy.getDefaultRemoteJndiName(unitSummary);
+                  else if(sbeanMD.getLocalHome() != null)
+                     jndiName = policy.getDefaultLocalHomeJndiName(unitSummary);
+                  else if(sbeanMD.getLocal() != null)
+                     jndiName = policy.getDefaultLocalJndiName(unitSummary);
+                  else
+                     jndiName = policy.getJndiName(unitSummary);
+               }
             }
             else if(policy != null)
             {