[Jboss-cvs] JBossAS SVN: r56065 - branches/JBoss_4_0_4_GA_JBAS-3526/tomcat/src/main/org/jboss/web/tomcat/tc5/session

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

Author: galder.zamarreno at jboss.com
Date: 2006-08-18 10:33:24 -0400 (Fri, 18 Aug 2006)
New Revision: 56065

Modified:
   branches/JBoss_4_0_4_GA_JBAS-3526/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java
Log:
[JBAS-3526] Port the fix for JBAS-3310 to 4.0.4.GA

Modified: branches/JBoss_4_0_4_GA_JBAS-3526/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3526/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java	2006-08-18 14:33:16 UTC (rev 56064)
+++ branches/JBoss_4_0_4_GA_JBAS-3526/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java	2006-08-18 14:33:24 UTC (rev 56065)
@@ -1109,23 +1109,23 @@
                log_.error("processSessionExpire: failed with exception: " + ex, ex);
                throw ex;
             }
+         }
 
-            // Next, handle any unloaded sessions that are stale
+         // Next, handle any unloaded sessions that are stale
 
-            long now = System.currentTimeMillis();
-            Map unloaded = new HashMap(unloadedSessions_);
-            Set entries = unloaded.entrySet();
-            for (Iterator it = entries.iterator(); it.hasNext(); )
+         long now = System.currentTimeMillis();
+         Map unloaded = new HashMap(unloadedSessions_);
+         Set entries = unloaded.entrySet();
+         for (Iterator it = entries.iterator(); it.hasNext(); )
+         {
+            Map.Entry entry = (Map.Entry) it.next();
+            Long last = (Long) entry.getValue();
+            int elapsed = (int) ((now - last.longValue()) / 1000L);
+            if (elapsed >= maxInactiveInterval_)
             {
-               Map.Entry entry = (Map.Entry) it.next();
-               Long last = (Long) entry.getValue();
-               int elapsed = (int) ((now - last.longValue()) / 1000L);
-               if (elapsed >= maxInactiveInterval_)
-               {
-                  String realId = (String) entry.getKey();
-                  proxy_.removeSessionLocal(realId);
-                  unloadedSessions_.remove(realId);
-               }
+               String realId = (String) entry.getKey();
+               proxy_.removeSessionLocal(realId);
+               unloadedSessions_.remove(realId);
             }
          }
       }