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

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

Author: emuckenhuber
Date: 2008-09-23 05:04:58 -0400 (Tue, 23 Sep 2008)
New Revision: 78779

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
[JBMETA-107] hack this merge.

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-09-23 08:29:10 UTC (rev 78778)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-09-23 09:04:58 UTC (rev 78779)
@@ -1016,9 +1016,17 @@
          // explicit merge, as this could be a implicit local interface
          if(soriginal.getBusinessLocals().size() == 1)
          {
-            if( (businessRemotes == null || businessRemotes.isEmpty())
-                  && remote == null && local == null)
-               businessLocals = soriginal.getBusinessLocals(); 
+            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();