svn commit: r454450 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

[fhanik]

Author: fhanik
Date: Mon Oct  9 11:28:21 2006
New Revision: 454450

URL: http://svn.apache.org/viewvc?view=rev&rev=454450
Log:
Corrected the use of the ACTIVITY_CHECK flag

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?view=diff&rev=454450&r1=454449&r2=454450
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
Mon Oct  9 11:28:21 2006
@@ -104,7 +104,6 @@
 
     public DeltaSession(Manager manager) {
         super(manager);
-        accessCount = new AtomicInteger();
         this.resetDeltaRequest();
     }
 
@@ -316,7 +315,7 @@
         if (!this.isValid) {
             return false;
         }
-        if (accessCount.get() > 0) {
+        if (ACTIVITY_CHECK && accessCount.get() > 0) {
             return true;
         }
         if (maxInactiveInterval >= 0) {
@@ -547,7 +546,6 @@
         isValid = ( (Boolean) stream.readObject()).booleanValue();
         thisAccessedTime = ( (Long) stream.readObject()).longValue();
         version = ( (Long) stream.readObject()).longValue();
-        this.accessCount = new AtomicInteger();
         boolean hasPrincipal = stream.readBoolean();
         principal = null;
         if (hasPrincipal) {
@@ -579,6 +577,7 @@
         if (notes == null) {
             notes = new Hashtable();
         }
+        activate();
     }
 
     public synchronized void writeExternal(ObjectOutput out ) throws 
java.io.IOException {
@@ -608,7 +607,6 @@
      *                if an input/output error occurs
      */
     private void writeObject(ObjectOutput stream) throws IOException {
-
         // Write the scalar instance variables (except Manager)
         stream.writeObject(new Long(creationTime));
         stream.writeObject(new Long(lastAccessedTime));



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]