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

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

Author: bdecoste
Date: 2007-07-26 11:50:58 -0400 (Thu, 26 Jul 2007)
New Revision: 64312

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java
Log:
[EJBTHREE-1019] guid and oid use for Ejb3Registry. Tests are passing, but I still need to rework this. Not happy with the current implementation.

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:50:30 UTC (rev 64311)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/LocalProxy.java	2007-07-26 15:50:58 UTC (rev 64312)
@@ -41,7 +41,8 @@
    private static Logger log = Logger.getLogger(LocalProxy.class);
    
    private transient Container container = null;
-   private String containerId;
+   protected String containerOid;
+   protected String containerGuid;
    protected String proxyName;
 
    protected LocalProxy()
@@ -51,28 +52,31 @@
    protected LocalProxy(Container container)
    {
       this.container = container;
-      this.containerId = Ejb3Registry.guid(container);
+      this.containerGuid = Ejb3Registry.guid(container);
+      this.containerOid = Ejb3Registry.oid(container);
       proxyName = container.getEjbName();
    }
 
    protected Container getContainer()
    {
       if(container == null)
-         container = Ejb3Registry.findContainer(containerId);
+         container = Ejb3Registry.findContainer(containerGuid);
       if(container == null)
-         log.warn("Container " + containerId + " is not yet available");
+         log.warn("Container " + containerGuid + " is not yet available");
       return container;
    }
    
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
-      this.containerId = in.readUTF();
+      this.containerGuid = in.readUTF();
+      this.containerOid = in.readUTF();
       this.proxyName = in.readUTF();
    }
 
    public void writeExternal(ObjectOutput out) throws IOException
    {
-      out.writeUTF(containerId);
+      out.writeUTF(containerGuid);
+      out.writeUTF(containerOid);
       out.writeUTF(proxyName);
    }