[Jboss-cvs] JBossAS SVN: r56319 - 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:38:59 -0400 (Sun, 27 Aug 2006)
New Revision: 56319

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/BatchReplicationClusteredSessionValve.java
Log:
Suppress CacheListener for life of request
Clean out unused thread locals

Modified: branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/BatchReplicationClusteredSessionValve.java
===================================================================
--- branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/BatchReplicationClusteredSessionValve.java	2006-08-28 03:38:19 UTC (rev 56318)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/BatchReplicationClusteredSessionValve.java	2006-08-28 03:38:59 UTC (rev 56319)
@@ -50,11 +50,6 @@
    // Valve-lifecycle_ helper object
    protected LifecycleSupport support = new LifecycleSupport(this);
 
-   // store the request and response object for parts of the clustering code that
-   // have no direct access to this objects
-   protected static ThreadLocal requestThreadLocal = new ThreadLocal();
-   protected static ThreadLocal responseThreadLocal = new ThreadLocal();
-
    protected JBossCacheManager manager_;
 
    /**
@@ -101,6 +96,8 @@
       // Start a new transaction, we need transaction so all the replication are sent in batch.
       try
       {
+         SessionReplicationContext.startLocalActivity();
+         
          tm.begin();
          // let the servlet invocation go through
          getNext().invoke(request, response);
@@ -123,6 +120,10 @@
          // We will need to alert Tomcat of this exception.
          throw new RuntimeException("JBossCacheManager.processSessionRepl(): failed to replicate session.", e);
       }
+      finally
+      {
+         SessionReplicationContext.finishLocalActivity();
+      }
    }
 
    // Lifecylce-interface