[Jboss-cvs] JBossAS SVN: r56537 - 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-09-03 22:07:19 -0400 (Sun, 03 Sep 2006)
New Revision: 56537

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/CacheListener.java
Log:
Minor code cleanup

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-09-04 02:04:22 UTC (rev 56536)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/CacheListener.java	2006-09-04 02:07:19 UTC (rev 56537)
@@ -52,10 +52,6 @@
    private static final int BUDDY_BACKUP_ROOT_OWNER_INDEX = BuddyManager.BUDDY_BACKUP_SUBTREE_FQN.size();
    // The size of the root of a buddy backup subtree (including owner)
    private static final int BUDDY_BACKUP_ROOT_OWNER_SIZE = BUDDY_BACKUP_ROOT_OWNER_INDEX + 1;
-   // Size of an Fqn that points to the root of a session in the buddy backup region
-//   private static final int BUDDY_SESSION_FQN_SIZE = BUDDY_BACKUP_ROOT_OWNER_SIZE + SESSION_FQN_SIZE;
-   // Size of an Fqn that points to the root of a session in the buddy backup region
-//   private static final int BUDDY_POJO_KEY_FQN_SIZE = BUDDY_BACKUP_ROOT_OWNER_SIZE + POJO_KEY_FQN_SIZE;
    
    private static Logger log_ = Logger.getLogger(CacheListener.class);
    private JBossCacheWrapper cacheWrapper_;
@@ -63,8 +59,7 @@
    private String webapp_;
    private String hostname_;
    private boolean fieldBased_;
-   private boolean sessionBased_;
-//   private boolean async_;
+   // When trying to ignore unwanted notifications, do we check for local activity first?
    private boolean disdainLocalActivity_;
 
    CacheListener(JBossCacheWrapper wrapper, JBossCacheManager manager, String hostname, String webapp)
@@ -75,10 +70,8 @@
       webapp_ =  webapp;
       int granularity = manager_.getReplicationGranularity();
       fieldBased_ = (granularity == WebMetaData.REPLICATION_GRANULARITY_FIELD);
-      sessionBased_ = (granularity == WebMetaData.REPLICATION_GRANULARITY_SESSION);
       // TODO decide if disdaining local activity is always good for REPL_ASYNC
-//      favorActivity_ = async_ || sessionBased_;
-      disdainLocalActivity_ = sessionBased_; // for now
+      disdainLocalActivity_ = (granularity == WebMetaData.REPLICATION_GRANULARITY_SESSION);; // for now
    }
 
    // --------------- TreeCacheListener methods ------------------------------------