[jboss-cvs] JBossAS SVN: r109107 - branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent.

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

Author: dereed
Date: 2010-11-03 16:48:34 -0400 (Wed, 03 Nov 2010)
New Revision: 109107

Modified:
   branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java
   branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java
   branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java
Log:
[JBPAPP-5274] Port fix to EAP 5.1


Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java	2010-11-03 20:37:58 UTC (rev 109106)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/AlwaysTrueOutdatedSessionChecker.java	2010-11-03 20:48:34 UTC (rev 109107)
@@ -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_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java	2010-11-03 20:37:58 UTC (rev 109106)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/TimestampBasedOutdatedSessionChecker.java	2010-11-03 20:48:34 UTC (rev 109107)
@@ -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_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java	2010-11-03 20:37:58 UTC (rev 109106)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5171/tomcat/src/main/org/jboss/web/tomcat/service/session/persistent/VersionBasedOutdatedSessionChecker.java	2010-11-03 20:48:34 UTC (rev 109107)
@@ -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;
    }