[Jboss-cvs] JBossAS SVN: r56322 - branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session

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

Author: bstansberry at jboss.com
Date: 2006-08-27 23:41:21 -0400 (Sun, 27 Aug 2006)
New Revision: 56322

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSessionValve.java
Log:
Pass the session itself to the SnapshotManager

Modified: branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSessionValve.java
===================================================================
--- branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSessionValve.java	2006-08-28 03:40:53 UTC (rev 56321)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSessionValve.java	2006-08-28 03:41:21 UTC (rev 56322)
@@ -23,7 +23,7 @@
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.Set;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 
@@ -32,7 +32,6 @@
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.catalina.valves.ValveBase;
-import org.jboss.web.tomcat.tc5.session.SessionReplicationContext.ReplicatableSession;
 
 /**
  * This Valve detects all sessions that were used in a request. All sessions are given to a snapshot
@@ -92,15 +91,14 @@
       {
          // --> We are now after the servlet invocation
    
-         Set sessions = SessionReplicationContext.clearContext();
+         Map sessions = SessionReplicationContext.clearContext();
          
          if (sessions.size() > 0)
          {
-            ReplicatableSession sess;
-            for (Iterator iter = sessions.iterator(); iter.hasNext();)
+            for (Iterator iter = sessions.entrySet().iterator(); iter.hasNext();)
             {
-               sess = (ReplicatableSession) iter.next();
-               sess.getSnapshot().snapshot(sess.getSessionId());
+               Map.Entry entry = (Map.Entry) iter.next();               
+               ((SnapshotManager) entry.getValue()).snapshot((ClusteredSession) entry.getKey());
             }
          }
       }