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

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

Author: scott.stark at jboss.org
Date: 2008-05-08 16:07:54 -0400 (Thu, 08 May 2008)
New Revision: 73171

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
Supplies of KnownInterfaces.REMOTE, KnownInterfaces.LOCAL are based on business remote, locals

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-05-08 19:09:21 UTC (rev 73170)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-05-08 20:07:54 UTC (rev 73171)
@@ -391,7 +391,6 @@
                // remote
                if(sbean.getRemote() != null && sbean.getRemote().length() > 0)
                {
-                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.REMOTE, null));
                   // Add ejb/vfsPath at iface
                   String remote = sbean.getRemote();
                   String ifacePath = prefix + "@" + remote;
@@ -453,7 +452,6 @@
                // local
                if(sbean.getLocal() != null && sbean.getLocal().length() > 0)
                {
-                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.LOCAL, null));
                   // Add ejb/vfsPath at iface
                   String local = sbean.getLocal();
                   String ifacePath = prefix + "@" + local;
@@ -483,8 +481,9 @@
                }
 
                BusinessLocalsMetaData locals = sbean.getBusinessLocals();
-               if(locals != null)
+               if(locals != null && locals.size() > 0)
                {
+                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.LOCAL, null));
                   for(String local : locals)
                   {
                      // Add ejb/vfsPath at iface
@@ -515,8 +514,9 @@
                   }
                }
                BusinessRemotesMetaData remotes = sbean.getBusinessRemotes();
-               if(remotes != null)
+               if(remotes != null && remotes.size() > 0)
                {
+                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.REMOTE, null));
                   for(String remote : remotes)
                   {
                      // Add ejb/vfsPath/iface