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

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

Author: bdecoste
Date: 2007-07-26 11:09:24 -0400 (Thu, 26 Jul 2007)
New Revision: 64308

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java
Log:
[EJBTHREE-1019] persist proxyName and unregister oid container

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-07-26 15:03:13 UTC (rev 64307)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-07-26 15:09:24 UTC (rev 64308)
@@ -103,6 +103,7 @@
       if(!hasContainer(guid))
          throw new IllegalStateException("Container " + guid + " + is not registered");
       containers.remove(guid);
+      clusterContainers.remove(oid(container));
    }
 
    /**

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java	2007-07-26 15:03:13 UTC (rev 64307)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java	2007-07-26 15:09:24 UTC (rev 64308)
@@ -67,11 +67,13 @@
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
       this.containerId = in.readUTF();
+      this.proxyName = in.readUTF();
    }
 
    public void writeExternal(ObjectOutput out) throws IOException
    {
       out.writeUTF(containerId);
+      out.writeUTF(proxyName);
    }
 
    public abstract String toString();

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java	2007-07-26 15:03:13 UTC (rev 64307)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/ProxyUtils.java	2007-07-26 15:09:24 UTC (rev 64308)
@@ -35,6 +35,7 @@
 import org.jboss.aspects.asynch.FutureHolder;
 import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
 import org.jboss.ejb3.remoting.Proxy;
+import org.jboss.logging.Logger;
 
 /**
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
@@ -42,6 +43,8 @@
  */
 public class ProxyUtils
 {
+   private static Logger log = Logger.getLogger(ProxyUtils.class);
+   
    public final static Class ASYNCH_PROVIDER_CLASS = AsynchProvider.class;
    public final static long GET_ASYNCHRONOUS;
    public static final long TO_STRING;
@@ -139,6 +142,7 @@
 
    public static Object handleCallLocally(long hash, Object jbproxy, Proxy ih, Method m, Object[] args)
    {
+      
       if (hash == ProxyUtils.GET_ASYNCHRONOUS)
       {
          return ih.getAsynchronousProxy((JBossProxy)jbproxy);