[Jboss-cvs] JBossAS SVN: r55409 - branches/JBoss_4_0_2_JBAS-3493/tomcat/src/main/org/jboss/web/tomcat/tc5/session

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

Author: bstansberry at jboss.com
Date: 2006-08-08 12:30:02 -0400 (Tue, 08 Aug 2006)
New Revision: 55409

Modified:
   branches/JBoss_4_0_2_JBAS-3493/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java
Log:
[JBAS-3493] Port JBAS-2792 fix to 4.0.2

Modified: branches/JBoss_4_0_2_JBAS-3493/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-3493/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java	2006-08-08 16:16:19 UTC (rev 55408)
+++ branches/JBoss_4_0_2_JBAS-3493/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java	2006-08-08 16:30:02 UTC (rev 55409)
@@ -554,7 +554,10 @@
                // session from the cache in case that might change the timeout
                if (session.isOutdated() && session.isValid(false) == false) {
                   String realId = getRealId(session.getId());
-                  session = (ClusteredSession) loadSession(realId);
+                  // JBAS-2792 don't assign the result of loadSession to session
+                  // just update the object from the cache or fall through if
+                  // the session has been removed from the cache
+                  loadSession(realId);
                }
                
                // Do a normal invalidation check that will expire any