[jboss-cvs] JBossAS SVN: r64266 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting.

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

Author: bdecoste
Date: 2007-07-24 19:15:52 -0400 (Tue, 24 Jul 2007)
New Revision: 64266

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.java
Log:
[EJBTHREE-1019] fix and test for invoking Local proxies remotely. Modified Ejb3Registry to use a GUID instead of the ObjectName of the container.

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.java	2007-07-24 22:33:15 UTC (rev 64265)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.java	2007-07-24 23:15:52 UTC (rev 64266)
@@ -57,16 +57,16 @@
 
    private Container findLocalContainer(Invocation invocation)
    {
-      Object oid = invocation.getMetaData(Dispatcher.DISPATCHER, Dispatcher.OID);
+      String guid = (String)invocation.getMetaData(IS_LOCAL, GUID);
       Container container = null;
       try
       {
-         container = Ejb3Registry.getContainer(oid.toString());
+         container = Ejb3Registry.getContainer(guid);
       }
       catch (IllegalStateException ignored)
       {
          if (log.isTraceEnabled())
-            log.trace("Cannot find local container for " + oid);
+            log.trace("Cannot find local container for " + guid);
       }
       
       if (container != null)
@@ -79,7 +79,7 @@
                if (log.isTraceEnabled())
                {
                   log.trace("Partition (" + ((EJBContainer) container).getPartitionName() + 
-                            ") for local container " + oid + " does not match invocation (" +
+                            ") for local container " + guid + " does not match invocation (" +
                             partitionName + ")");
                }
                container = null;
@@ -87,7 +87,7 @@
             else if (log.isTraceEnabled())
             {
                log.trace("Partition (" + ((EJBContainer) container).getPartitionName() + 
-                     ") for local container " + oid + " matches invocation (" +
+                     ") for local container " + guid + " matches invocation (" +
                      partitionName + ")");
             }
          }