[jboss-cvs] JBossAS SVN: r70797 - in projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache: spi and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2008-03-12 23:19:14 -0400 (Wed, 12 Mar 2008)
New Revision: 70797

Modified:
   projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java
   projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java
   projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java
   projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java
   projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/SerializationGroupMember.java
Log:
[EJBTHREE-1026] Add property BackingCacheEntry.prePassivated

Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java	2008-03-13 03:17:56 UTC (rev 70796)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java	2008-03-13 03:19:14 UTC (rev 70797)
@@ -89,6 +89,8 @@
          
          passivationManager.postActivate(entry);
          
+         entry.setPrePassivated(false);
+         
          entry.setInUse(true);
          return entry;
       }
@@ -112,6 +114,8 @@
 
          passivationManager.prePassivate(entry);
          
+         entry.setPrePassivated(true);
+         
          store.passivate(entry);
       }
    }

Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java	2008-03-13 03:17:56 UTC (rev 70796)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java	2008-03-13 03:19:14 UTC (rev 70797)
@@ -150,7 +150,6 @@
       if (!entry.isPrePassivated())
       {
          passivationManager.prePassivate(entry.getUnderlyingItem());
-         entry.setPrePassivated(true);
       }
       
       // If this call is coming via PassivatingBackingCache.passivate(), 

Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java	2008-03-13 03:17:56 UTC (rev 70796)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java	2008-03-13 03:19:14 UTC (rev 70797)
@@ -60,4 +60,16 @@
     * @return
     */
    long getLastUsed();
+   
+   /**
+    * Gets whether the entry can be passivated without invoking
+    * any callbacks on the underlying item.
+    */
+   boolean isPrePassivated();
+   
+   /**
+    * Sets whether the entry can be passivated without invoking 
+    * any callbacks on the underlying item.
+    */
+   void setPrePassivated(boolean prePassivated);
 }

Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java	2008-03-13 03:17:56 UTC (rev 70796)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java	2008-03-13 03:19:14 UTC (rev 70797)
@@ -39,6 +39,7 @@
    
    private long lastUsed;
    private transient boolean inUse;
+   private boolean prePassivated;
 
    public long getLastUsed()
    {
@@ -61,4 +62,16 @@
       this.lastUsed = lastUsed;
    }
 
+   public boolean isPrePassivated()
+   {
+      return prePassivated;
+   }
+
+   public void setPrePassivated(boolean prePassivated)
+   {
+      this.prePassivated = prePassivated;
+   }
+   
+   
+
 }
\ No newline at end of file

Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/SerializationGroupMember.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/SerializationGroupMember.java	2008-03-13 03:17:56 UTC (rev 70796)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/SerializationGroupMember.java	2008-03-13 03:19:14 UTC (rev 70797)
@@ -71,7 +71,6 @@
    private boolean clustered;
    
    private boolean preReplicated;
-   private boolean prePassivated;
    
    /** The cache that's handling us */
 //   private transient PassivatingBackingCache<T, SerializationGroupMember<T>> cache;
@@ -184,16 +183,6 @@
 //      cache.passivate(this.id);
    }
    
-   public boolean isPrePassivated()
-   {
-      return prePassivated;
-   }
-   
-   public void setPrePassivated(boolean prePassivated)
-   {
-      this.prePassivated = prePassivated;
-   }
-   
    /**
     * Notification that the group has been activated from a passivated state.
     */