[jboss-cvs] JBossAS SVN: r81138 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/session.

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

Author: bstansberry at jboss.com
Date: 2008-11-16 11:07:44 -0500 (Sun, 16 Nov 2008)
New Revision: 81138

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
[JBAS-6193] Don't leak ReplicationStatistics.TimeStatistic

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-11-16 15:57:53 UTC (rev 81137)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-11-16 16:07:44 UTC (rev 81138)
@@ -907,6 +907,10 @@
             if (trace_)
                log_.trace("Removed entry for session " + realId + " from unloaded session map");
          }
+         
+         // If session has failed over and has been passivated here,
+         // session will be null, but we'll have a TimeStatistic to clean up
+         stats_.removeStats(realId);
       }
       else
       {
@@ -933,14 +937,14 @@
          }
          finally
          {
+            // Remove any stats for this session
+            stats_.removeStats(realId);
+            
             if (switcher != null)
             {
                switcher.reset();
             }
          }
-
-         // Remove any stats for this session
-         stats_.removeStats(realId);
       }
    }
    
@@ -1290,6 +1294,7 @@
                   // Either way, do a cleanup
                   proxy_.removeSessionLocal(realId, osu.owner);
                   unloadedSessions_.remove(realId);
+                  stats_.removeStats(realId);
                   
                }
                else if (passivate && !osu.passivated)
@@ -2256,7 +2261,6 @@
       return sb.toString();
    }   
    
-   @SuppressWarnings("unchecked")
    private static ContextClassLoaderSwitcher getContextClassLoaderSwitcher()
    {
       return (ContextClassLoaderSwitcher) AccessController.doPrivileged(ContextClassLoaderSwitcher.INSTANTIATOR);