[Jboss-cvs] JBossAS SVN: r56306 - 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-26 23:29:25 -0400 (Sat, 26 Aug 2006)
New Revision: 56306

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/CacheListener.java
Log:
Don't log concurrent access warning during BR gravitation

Modified: branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/CacheListener.java
===================================================================
--- branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/CacheListener.java	2006-08-26 21:23:31 UTC (rev 56305)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/CacheListener.java	2006-08-27 03:29:25 UTC (rev 56306)
@@ -160,11 +160,17 @@
                           version.intValue());
             }
          }
-         else
+         else if (!pfqn.isBuddyTree)
          {
             log_.warn("Possible concurrency problem: Replicated version id " + 
                       version + " matches in-memory version for session " + realId); 
          }
+         /*else 
+         {
+            We have a local session but got a modification for the buddy tree.
+            This means another node is in the process of taking over the session
+         }
+          */
       }
       else
       {
@@ -207,6 +213,7 @@
       Fqn raw;
       Fqn noBuddy;
       String owner;
+      boolean isBuddyTree;
       
       ParsedBuddyFqn(Fqn raw)
       {
@@ -216,6 +223,7 @@
          {
             owner = (String) raw.get(BUDDY_BACKUP_ROOT_OWNER_INDEX);
             noBuddy = raw.getFqnChild(BUDDY_BACKUP_ROOT_OWNER_SIZE, raw.size());
+            isBuddyTree = true;
             if (log_.isTraceEnabled())
                log_.trace(raw + " parsed to " + noBuddy + " with owner " + owner);
          }