[jboss-cvs] JBossAS SVN: r64405 - in branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3: stateful and 1 other directory.

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

Author: bdecoste
Date: 2007-08-01 15:02:50 -0400 (Wed, 01 Aug 2007)
New Revision: 64405

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
Log:
[EJBTHREE-1019] same VMID for factory and registry

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-08-01 17:50:24 UTC (rev 64404)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-08-01 19:02:50 UTC (rev 64405)
@@ -44,7 +44,7 @@
    private static Map<String, Container> containers = new HashMap<String, Container>();
    private static Map<String, Container> clusterContainers = new HashMap<String, Container>();
    
-   private static final VMID VMID = new VMID();
+   private static final VMID vmid = new VMID();
 
    /**
     * Find a potential container.
@@ -56,6 +56,11 @@
    {
       return containers.get(guid);
    }
+   
+   public static VMID getVMID()
+   {
+      return vmid;
+   }
 
    /**
     * Reports the existance of a container.
@@ -73,9 +78,14 @@
       return clusterContainers.containsKey(oid);
    }
    
+   public static final String guid(Container container, VMID vmid)
+   {
+      return container.getObjectName().getCanonicalName() + ",VMID=" + vmid;
+   }
+   
    public static final String guid(Container container)
    {
-      return container.getObjectName().getCanonicalName() + ",VMID=" + VMID;
+      return guid(container, vmid);
    }
    
    public static final String clusterUid(Container container)

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java	2007-08-01 17:50:24 UTC (rev 64404)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxy.java	2007-08-01 19:02:50 UTC (rev 64405)
@@ -60,7 +60,7 @@
    {
       super(container);
       this.id = id;
-      this.containerGuid = this.containerClusterUid + ",VMID=" + vmid;
+      this.containerGuid = Ejb3Registry.guid(container, vmid);
       isClustered = ((StatefulContainer)container).isClustered();
    }
 
@@ -69,6 +69,7 @@
       super(container);
       this.provider = provider;
       this.id = id;
+      this.containerGuid = Ejb3Registry.guid(container);
       isClustered = ((StatefulContainer)container).isClustered();
    }
 
@@ -112,8 +113,8 @@
          container = Ejb3Registry.getClusterContainer(containerClusterUid);
        
       if (container == null)
-         throw new EJBException("Invalid (i.e. remote) invocation of local interface (null container)");
-      
+         throw new EJBException("Invalid (i.e. remote) invocation of local interface (null container) for " + containerGuid);
+   
       StatefulContainer sfsb = (StatefulContainer)container;
       return sfsb.localInvoke(id, method, args, (FutureHolder) provider);
    }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java	2007-08-01 17:50:24 UTC (rev 64404)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java	2007-08-01 19:02:50 UTC (rev 64405)
@@ -28,6 +28,7 @@
 import javax.naming.NamingException;
 import org.jboss.annotation.ejb.LocalBinding;
 import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Registry;
 import org.jboss.ejb3.JBossProxy;
 import org.jboss.ejb3.NonSerializableFactory;
 import org.jboss.ejb3.ProxyFactoryHelper;
@@ -44,7 +45,7 @@
 {
    private static final Logger log = Logger.getLogger(StatefulLocalProxyFactory.class);
    
-   private VMID vmid = new VMID();
+   private VMID vmid = Ejb3Registry.getVMID();
 
    protected Class[] getInterfaces()
    {