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

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

Author: emuckenhuber
Date: 2008-10-27 20:23:17 -0400 (Mon, 27 Oct 2008)
New Revision: 80127

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
[JBMETA-107] remove workaround for implicit local interfaces, as this is not needed anymore

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-10-27 22:23:52 UTC (rev 80126)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-10-28 00:23:17 UTC (rev 80127)
@@ -1012,25 +1012,7 @@
       if(joverride != null && joverride.getBusinessLocals() != null)
          businessLocals = joverride.getBusinessLocals();
       else if(soriginal != null && soriginal.getBusinessLocals() != null)
-      {
-         // explicit merge, as this could be a implicit local interface
-         if(soriginal.getBusinessLocals().size() == 1)
-         {
-            String businessLocal = soriginal.getBusinessLocals().iterator().next();
-            if( (businessRemotes == null || ! businessRemotes.contains(businessLocal)))
-            {
-               if(remote == null || !remote.equals(businessLocal))
-               {
-                  if(local == null || !local.equals(businessLocal))
-                  {
-                     businessLocals = soriginal.getBusinessLocals();
-                  }
-               }
-            }
-         }
-         else
-            businessLocals = soriginal.getBusinessLocals();
-      }
+         businessLocals = soriginal.getBusinessLocals();
       // serviceEndpoint
       if(joverride != null && joverride.getServiceEndpoint() != null)
          serviceEndpoint = joverride.getServiceEndpoint();