[jboss-cvs] JBossAS SVN: r78587 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/jbmeta107/unit and 1 other directory.

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

Author: emuckenhuber
Date: 2008-09-16 09:08:13 -0400 (Tue, 16 Sep 2008)
New Revision: 78587

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java
Log:
[JBMETA-107] implicit interface

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-16 13:02:59 UTC (rev 78586)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-09-16 13:08:13 UTC (rev 78587)
@@ -1016,7 +1016,8 @@
          // explicit merge, as this could be a implicit local interface
          if(soriginal.getBusinessLocals().size() == 1)
          {
-            if(businessRemotes == null || ! businessRemotes.containsAll(soriginal.getBusinessLocals()))
+            if( (businessRemotes == null || businessRemotes.isEmpty())
+                  && remote == null && local == null)
                businessLocals = soriginal.getBusinessLocals(); 
          }
          else

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java	2008-09-16 13:02:59 UTC (rev 78586)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java	2008-09-16 13:08:13 UTC (rev 78587)
@@ -92,7 +92,7 @@
       JBossSessionBeanMetaData beanMetaData = (JBossSessionBeanMetaData) mergedMetaData.getEnterpriseBean("OverrideImplicitLocalBean");
       
       assertNotNull("No meta data for bean OverrideImplicitLocalBean", beanMetaData);
-      assertEmpty("Should not have any business local interfaces", beanMetaData.getBusinessLocals());
+      assertNull("Should not have any business local interfaces", beanMetaData.getBusinessLocals());
       assertEquals(OverrideImplicitLocal.class.getName(), beanMetaData.getRemote());
    }