[Jboss-cvs] JBossAS SVN: r56404 - 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-29 11:35:14 -0400 (Tue, 29 Aug 2006)
New Revision: 56404

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java
Log:
Optimize for non-cross-context sessions. Simplify to 1 ThreadLocal.

Modified: branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java
===================================================================
--- branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java	2006-08-29 15:34:29 UTC (rev 56403)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheManager.java	2006-08-29 15:35:14 UTC (rev 56404)
@@ -627,9 +627,9 @@
 
          synchronized (session)
          {
-            if (log_.isDebugEnabled())
+            if (log_.isTraceEnabled())
             {
-               log_.debug("check to see if needs to store and replicate " +
+               log_.trace("check to see if needs to store and replicate " +
                           "session with id " + session.getIdInternal());
             }
 
@@ -893,11 +893,11 @@
 
          try {
             // Ignore any cache notifications that our own work generates
-            SessionReplicationContext.startLocalActivity();
+            SessionReplicationContext.startCacheActivity();
             clusterSess.removeMyself();
          }
          finally {
-            SessionReplicationContext.finishLocalActivity();
+            SessionReplicationContext.finishCacheActivity();
             
             // We don't want to replicate this session at the end
             // of the request; the removal process took care of that
@@ -931,12 +931,12 @@
 
          try {
             // Ignore any cache notifications that our own work generates
-            SessionReplicationContext.startLocalActivity();
+            SessionReplicationContext.startCacheActivity();
             clusterSess.removeMyselfLocal();
          }
          finally
          {
-            SessionReplicationContext.finishLocalActivity();
+            SessionReplicationContext.finishCacheActivity();
             
             // We don't want to replicate this session at the end
             // of the request; the removal process took care of that
@@ -1002,7 +1002,7 @@
             
             // Ignore cache notifications we may generate for this 
             // session if data gravitation occurs. 
-            SessionReplicationContext.startLocalActivity();
+            SessionReplicationContext.startCacheActivity();
             
             session = proxy_.loadSession(realId, session);
          }
@@ -1033,7 +1033,7 @@
                   endTransaction(realId);
             }
             finally {
-               SessionReplicationContext.finishLocalActivity();
+               SessionReplicationContext.finishCacheActivity();
             }
          }
 
@@ -1089,7 +1089,7 @@
          // at this level because we don't want to resume handling
          // notifications until any compensating changes resulting
          // from a tx rollback are done.
-         SessionReplicationContext.startLocalActivity();
+         SessionReplicationContext.startCacheActivity();
 
          session.processSessionRepl();
       }
@@ -1122,7 +1122,7 @@
                endTransaction(session.getId());
          }
          finally {
-            SessionReplicationContext.finishLocalActivity();
+            SessionReplicationContext.finishCacheActivity();
          }
       }
    }