[jboss-cvs] JBossAS SVN: r69966 - in projects/ejb3/trunk/core/src: test/resources/test/ejbthree994 and 1 other directory.

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

Author: bdecoste
Date: 2008-02-20 01:50:47 -0500 (Wed, 20 Feb 2008)
New Revision: 69966

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ProxyFactoryHelper.java
   projects/ejb3/trunk/core/src/test/resources/test/ejbthree994/ejbthree994-connectors-service.xml
Log:
[EJBTHREE-1190] [EJBTHREE-1191] find correct connector

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ProxyFactoryHelper.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ProxyFactoryHelper.java	2008-02-20 06:27:57 UTC (rev 69965)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/ProxyFactoryHelper.java	2008-02-20 06:50:47 UTC (rev 69966)
@@ -778,15 +778,33 @@
       String clientBindUrl = binding.clientBindUrl();
       if (clientBindUrl.trim().length() == 0)
       {
-         ObjectName connectionON = new ObjectName("jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3");
-         KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
-         try
+         if (binding.invokerName().trim().length() != 0)
          {
-            clientBindUrl = (String)kernelAbstraction.getAttribute(connectionON, "InvokerLocator");
+            try
+            {
+               ObjectName connectionON = new ObjectName(binding.invokerName());
+               KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
+               clientBindUrl = (String)kernelAbstraction.getAttribute(connectionON, "InvokerLocator");
+            }
+            catch (Exception e)
+            {
+               log.warn("Unable to find InvokerLocator " + binding.invokerName() + ". Using default. " + e);
+               clientBindUrl = RemoteProxyFactory.DEFAULT_CLIENT_BINDING;
+            }
          }
-         catch (Exception e)
+         else
          {
-            clientBindUrl = RemoteProxyFactory.DEFAULT_CLIENT_BINDING;
+            try
+            {
+               ObjectName connectionON = new ObjectName("jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3");
+               KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
+               clientBindUrl = (String)kernelAbstraction.getAttribute(connectionON, "InvokerLocator");
+            }
+            catch (Exception e)
+            {
+               log.warn("Unable to find default InvokerLocator. Using default. " + e);
+               clientBindUrl = RemoteProxyFactory.DEFAULT_CLIENT_BINDING;
+            }
          }
       }
       else if (clientBindUrl.indexOf("0.0.0.0") != -1)

Modified: projects/ejb3/trunk/core/src/test/resources/test/ejbthree994/ejbthree994-connectors-service.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/ejbthree994/ejbthree994-connectors-service.xml	2008-02-20 06:27:57 UTC (rev 69965)
+++ projects/ejb3/trunk/core/src/test/resources/test/ejbthree994/ejbthree994-connectors-service.xml	2008-02-20 06:50:47 UTC (rev 69966)
@@ -15,5 +15,16 @@
          </handlers>
       </attribute>
    </mbean>
+   
+   <mbean code="org.jboss.remoting.transport.Connector"
+          name="jboss.remoting.test:type=Connector,name=Ejbthree994TestEjb3Connector,handler=ejb3">
+      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3875</attribute>
+      <attribute name="Configuration">
+         <handlers>
+            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+         </handlers>
+      </attribute>
+   </mbean>
+   
 
 </server>