[jboss-cvs] JBossAS SVN: r114645 - projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122.

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

Author: soul2zimate
Date: 2014-01-02 01:42:18 -0500 (Thu, 02 Jan 2014)
New Revision: 114645

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java
Log:
[JBPAPP-10944], fix MultipleDefinitionsOfSameBusinessInterfaceUnitTestCase deployment failure with AmbiguousEjbReferenceException

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java	2014-01-02 02:29:19 UTC (rev 114644)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java	2014-01-02 06:42:18 UTC (rev 114645)
@@ -22,6 +22,8 @@
 package org.jboss.ejb3.test.ejbthree1122;
 
 import javax.ejb.EJB;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import org.jboss.ejb3.annotation.LocalBinding;
 import org.jboss.ejb3.annotation.RemoteBinding;
@@ -40,12 +42,12 @@
 @LocalBinding(jndiBinding = TestLocalBusinessInterface.JNDI_NAME_SERVICE_LOCAL)
 public class TestServiceBean extends TestBaseClass implements TestRemoteBusinessInterface, TestLocalBusinessInterface
 {
-   // Instance Members
-   @EJB(mappedName = TestLocalBusinessInterface.JNDI_NAME_SERVICE_LOCAL)
-   TestLocalBusinessInterface localRef;
-
    public TestLocalBusinessInterface getLocal()
    {
-      return localRef;
+        try {
+            return (TestLocalBusinessInterface) new InitialContext().lookup(TestLocalBusinessInterface.JNDI_NAME_SERVICE_LOCAL);
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
    }
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java	2014-01-02 02:29:19 UTC (rev 114644)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java	2014-01-02 06:42:18 UTC (rev 114645)
@@ -23,6 +23,8 @@
 
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import org.jboss.ejb3.annotation.LocalBinding;
 import org.jboss.ejb3.annotation.RemoteBinding;
@@ -40,12 +42,13 @@
 @LocalBinding(jndiBinding = TestLocalBusinessInterface.JNDI_NAME_STATELESS_LOCAL)
 public class TestStatelessBean extends TestBaseClass implements TestRemoteBusinessInterface, TestLocalBusinessInterface
 {
-   // Instance Members
-   @EJB(mappedName = TestLocalBusinessInterface.JNDI_NAME_STATELESS_LOCAL)
-   TestLocalBusinessInterface localRef;
-
    public TestLocalBusinessInterface getLocal()
    {
-      return localRef;
+        try {
+            return (TestLocalBusinessInterface) new InitialContext()
+                    .lookup(TestLocalBusinessInterface.JNDI_NAME_STATELESS_LOCAL);
+        } catch (NamingException e) {
+            throw new RuntimeException(e);
+        }
    }
 }