[jboss-cvs] JBossAS SVN: r65969 - projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl.

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

Author: bstansberry at jboss.com
Date: 2007-10-09 09:45:55 -0400 (Tue, 09 Oct 2007)
New Revision: 65969

Modified:
   projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupedPassivatingCacheImpl2.java
Log:
Fix postXXX calls
Rename replicate to update

Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupedPassivatingCacheImpl2.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupedPassivatingCacheImpl2.java	2007-10-09 13:45:27 UTC (rev 65968)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupedPassivatingCacheImpl2.java	2007-10-09 13:45:55 UTC (rev 65969)
@@ -115,14 +115,14 @@
             entry.setGroup(groupCache.peek(entry.getGroupId()));
          }
          
-         if(entry.getSerializableObject() == null)
+         if(entry.getGroup() != null)
          {
             entry.setSerializableObject((T) entry.getGroup().getMemberObject(entry.getId()));
+            
+            // Notify the group that this entry is active
+            entry.getGroup().addActive(entry);
          }
          
-         // Notify the group that this entry is active
-         entry.getGroup().addActive(entry);
-         
          // Invoke callbacks on the underlying object
          passivationManager.postActivate(entry.getSerializableObject());
       }
@@ -214,29 +214,30 @@
          log.trace("postreplicate " + entry);
          
          // Restore the entry's ref to the group and object
-         if(entry.getSerializableObject() == null)
+         if(entry.getGroup() == null)
          {
-            if(entry.getGroup() == null)
-            {
-               // TODO: peek or get?
-               // BES 2007/10/06 I think peek is better; no
-               // sense marking the group as in-use and then having
-               // to release it or something
-               entry.setGroup(groupCache.peek(entry.getGroupId()));
-            }
+            // TODO: peek or get?
+            // BES 2007/10/06 I think peek is better; no
+            // sense marking the group as in-use and then having
+            // to release it or something
+            entry.setGroup(groupCache.peek(entry.getGroupId()));
+         }
+         
+         if(entry.getGroup() != null)
+         {
             entry.setSerializableObject((T) entry.getGroup().getMemberObject(entry.getId()));
+            
+            // Notify the group that this entry is active
+            entry.getGroup().addActive(entry);
          }
          
-         // Notify the group that this entry is active
-         entry.getGroup().addActive(entry);
-         
          // Invoke callbacks on the underlying object
          passivationManager.postReplicate(entry.getSerializableObject());
       }
 
-      public void replicate(SerializationGroupMemberImpl<T> entry)
+      public void update(SerializationGroupMemberImpl<T> entry)
       {
-         store.replicate(entry);
+         store.update(entry);
       }
 
       public boolean isClustered()