[jboss-cvs] JBossAS SVN: r64286 - 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-07-25 22:56:50 -0400 (Wed, 25 Jul 2007)
New Revision: 64286

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
Log:
[EJBTHREE-1019] oid and guid used by context

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 01:16:28 UTC (rev 64285)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Registry.java	2007-07-26 02:56:50 UTC (rev 64286)
@@ -71,7 +71,7 @@
       return container.getObjectName().getCanonicalName() + ",VMID=" + VMID;
    }
    
-   private static final String oid(Container container)
+   public static final String oid(Container container)
    {
       return container.getObjectName().getCanonicalName();
    }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java	2007-07-26 01:16:28 UTC (rev 64285)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/NestedStatefulBeanContext.java	2007-07-26 02:56:50 UTC (rev 64286)
@@ -64,7 +64,8 @@
 
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
-      containerName = in.readUTF();
+      containerOid = in.readUTF();
+      containerGuid = in.readUTF();
       id = in.readObject();
       metadata = (SimpleMetaData) in.readObject();
       bean = in.readObject();

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java	2007-07-26 01:16:28 UTC (rev 64285)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java	2007-07-26 02:56:50 UTC (rev 64286)
@@ -88,7 +88,8 @@
 
    protected boolean removed;
 
-   protected String containerName;
+   protected String containerOid;
+   protected String containerGuid;
    
    protected boolean replicationIsPassivation = true;
    
@@ -309,7 +310,8 @@
          NestedStatefulBeanContext nested = new NestedStatefulBeanContext();
          nested.id = id;
          nested.container = getContainer();
-         nested.containerName = containerName;
+         nested.containerOid = containerOid;
+         nested.containerGuid = containerGuid;
          nested.bean = bean;
          nested.replicationIsPassivation = replicationIsPassivation;
          containedIn.addContains(nested);
@@ -720,14 +722,18 @@
    public void setContainer(Container container)
    {
       super.setContainer(container);
-      containerName = Ejb3Registry.guid(container);
+      containerOid = Ejb3Registry.oid(container);
+      containerGuid = Ejb3Registry.guid(container);
    }
 
    public Container getContainer()
    {
       if (container == null)
       {
-         container = Ejb3Registry.getContainer(containerName);
+         container = Ejb3Registry.findContainer(containerGuid);
+         
+         if (container == null)
+            container = Ejb3Registry.getClusterContainer(containerOid);
       }
       return container;
    }
@@ -816,7 +822,8 @@
 
    public void writeExternal(ObjectOutput out) throws IOException
    {
-      out.writeUTF(containerName);
+      out.writeUTF(containerOid);
+      out.writeUTF(containerGuid);
       out.writeObject(id);
       out.writeObject(metadata);
       out.writeLong(lastUsed);
@@ -859,7 +866,8 @@
    public void readExternal(ObjectInput in) throws IOException,
            ClassNotFoundException
    {
-      containerName = in.readUTF();
+      containerOid = in.readUTF();
+      containerGuid = in.readUTF();
       id = in.readObject();
       metadata = (SimpleMetaData) in.readObject();
       lastUsed = in.readLong();