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

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

Author: bstansberry at jboss.com
Date: 2010-05-10 19:55:03 -0400 (Mon, 10 May 2010)
New Revision: 104645

Modified:
   branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
[JBPAPP-4275] During startup include full session count when deciding on passivation

Modified: branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-05-10 23:37:08 UTC (rev 104644)
+++ branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-05-10 23:55:03 UTC (rev 104645)
@@ -1550,11 +1550,17 @@
             
             OwnedSessionUpdate osu = new OwnedSessionUpdate(owner, lastMod, maxLife, false);
             unloadedSessions_.put(realId, osu);
-            if (passivate)
+         }
+         
+         if (passivate)
+         {
+            for (Map.Entry<String, OwnedSessionUpdate> entry : unloadedSessions_.entrySet())
             {
+               String realId = entry.getKey();
+               OwnedSessionUpdate osu = entry.getValue();
                try
                {
-                  long elapsed = System.currentTimeMillis() - lastMod;
+                  long elapsed = System.currentTimeMillis() - osu.getUpdateTime();
                   // if maxIdle time configured, means that we need to passivate sessions that have
                   // exceeded the max allowed idle time
                   if (passivationMax >= 0