[jboss-cvs] JBossAS SVN: r64878 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/session.

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

Author: bstansberry at jboss.com
Date: 2007-08-25 10:29:13 -0400 (Sat, 25 Aug 2007)
New Revision: 64878

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListener.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListenerBase.java
Log:
Expose some static methods to unit tests

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListener.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListener.java	2007-08-25 14:28:55 UTC (rev 64877)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListener.java	2007-08-25 14:29:13 UTC (rev 64878)
@@ -57,15 +57,11 @@
 
    @NodeRemoved
    public void nodeRemoved(NodeRemovedEvent event)
-   {
-      nodeRemoved(event.getFqn(), event.isPre(), event.isOriginLocal(), event.getData());
-   }
-   
-   private void nodeRemoved(Fqn fqn, boolean pre, boolean isLocal, Map data)
-   {
-      if (pre || isLocal)
+   {      
+      if (event.isPre() || event.isOriginLocal())
          return;
       
+      Fqn fqn = event.getFqn();
       boolean isBuddy = isBuddyFqn(fqn);
       
       // Potential removal of a Pojo where we need to unregister as an Observer.
@@ -89,15 +85,11 @@
    
    @NodeModified
    public void nodeModified(NodeModifiedEvent event)
-   {
-      nodeModified(event.getFqn(), event.isPre(), event.isOriginLocal(), event.getData());
-   }
-   
-   private void nodeModified(Fqn fqn, boolean pre, boolean isLocal, Map data)
-   {
-      if (pre || isLocal)
+   {          
+      if (event.isPre() || event.isOriginLocal())
          return;
       
+      Fqn fqn = event.getFqn();
       boolean isBuddy = isBuddyFqn(fqn);      
       // We only care if there is a chance this is for a session root
       if (!isFqnSessionRootSized(fqn, isBuddy))
@@ -109,7 +101,7 @@
 
       // Query if we have version value in the distributed cache. 
       // If we have a version value, compare the version and invalidate if necessary.
-      Integer version = (Integer)data.get(JBossCacheService.VERSION_KEY);
+      Integer version = (Integer) event.getData().get(JBossCacheService.VERSION_KEY);
       if(version != null)
       {
          String realId = getIdFromFqn(fqn, isBuddy);
@@ -165,12 +157,12 @@
       // BES -- 2007/07/03 Not sure what this means
    }
    
-   private static boolean isFqnPojoKeySized(Fqn fqn, boolean isBuddy)
+   public static boolean isFqnPojoKeySized(Fqn fqn, boolean isBuddy)
    {
       return fqn.size() == (isBuddy ? BUDDY_BACKUP_ROOT_OWNER_SIZE + POJO_KEY_FQN_SIZE : POJO_KEY_FQN_SIZE);
    }
    
-   private static String getPojoKeyFromFqn(Fqn fqn, boolean isBuddy)
+   public static String getPojoKeyFromFqn(Fqn fqn, boolean isBuddy)
    {
       return (String) fqn.get(isBuddy ? BUDDY_BACKUP_ROOT_OWNER_SIZE + POJO_KEY_FQN_INDEX: POJO_KEY_FQN_INDEX);
    }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListenerBase.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListenerBase.java	2007-08-25 14:28:55 UTC (rev 64877)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/CacheListenerBase.java	2007-08-25 14:29:13 UTC (rev 64878)
@@ -41,17 +41,17 @@
       return false;
    }
 
-   protected static boolean isFqnSessionRootSized(Fqn fqn, boolean isBuddy)
+   public static boolean isFqnSessionRootSized(Fqn fqn, boolean isBuddy)
    {
       return fqn.size() == (isBuddy ? BUDDY_BACKUP_ROOT_OWNER_SIZE + SESSION_FQN_SIZE : SESSION_FQN_SIZE);
    }
 
-   protected static String getIdFromFqn(Fqn fqn, boolean isBuddy)
+   public static String getIdFromFqn(Fqn fqn, boolean isBuddy)
    {
       return (String)fqn.get(isBuddy ? BUDDY_BACKUP_ROOT_OWNER_SIZE + SESSION_ID_FQN_INDEX : SESSION_ID_FQN_INDEX);
    }
 
-   protected static boolean isBuddyFqn(Fqn fqn)
+   public static boolean isBuddyFqn(Fqn fqn)
    {
       try
       {
@@ -71,7 +71,7 @@
     * 
     * @param fqn An Fqn that is a child of the buddy backup root node.
     */
-   protected static String getBuddyOwner(Fqn fqn)
+   public static String getBuddyOwner(Fqn fqn)
    {
       return (String) fqn.get(BUDDY_BACKUP_ROOT_OWNER_INDEX);     
    }