[jboss-cvs] JBossAS SVN: r108398 - branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent.

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

Author: bstansberry at jboss.com
Date: 2010-09-30 22:55:05 -0400 (Thu, 30 Sep 2010)
New Revision: 108398

Modified:
   branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java
   branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java
   branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java
Log:
[JBPAPP-5171] Don't treat sessions that have never been persisted as outdated

Modified: branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java
===================================================================
--- branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java	2010-09-30 20:55:53 UTC (rev 108397)
+++ branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java	2010-10-01 02:55:05 UTC (rev 108398)
@@ -19,7 +19,8 @@
 {
    public boolean isSessionOutdated(ClusteredSession<? extends OutgoingDistributableSessionData> session)
    {
-      return true;
+      // JBPAPP-5171 fix -- session that has never been replicated can't be outdated
+      return session.getLastReplicated() > 0;
    }
 
 }

Modified: branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java
===================================================================
--- branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java	2010-09-30 20:55:53 UTC (rev 108397)
+++ branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java	2010-10-01 02:55:05 UTC (rev 108398)
@@ -37,6 +37,10 @@
       {
          result = session.getLastAccessedTimeInternal() < timestamp.longValue();
       }
+      else {
+         // JBPAPP-5171 fix -- session that has never been replicated can't be outdated
+         result = session.getLastReplicated() > 0;
+      }
       return result;
    }
 

Modified: branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java
===================================================================
--- branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java	2010-09-30 20:55:53 UTC (rev 108397)
+++ branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java	2010-10-01 02:55:05 UTC (rev 108398)
@@ -38,6 +38,10 @@
          session.setVersionFromDistributedCache(version.intValue());
          result = session.isOutdated();
       }
+      else {
+         // JBPAPP-5171 fix -- session that has never been replicated can't be outdated
+         result = session.getLastReplicated() > 0;
+      }
       return result;
    }