[jboss-cvs] JBossAS SVN: r92404 - projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc.

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

Author: bstansberry at jboss.com
Date: 2009-08-15 16:38:08 -0400 (Sat, 15 Aug 2009)
New Revision: 92404

Modified:
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java
Log:
[JBCLUSTER-238] Apply fix to nodeRemoved as well

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java	2009-08-15 13:55:19 UTC (rev 92403)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java	2009-08-15 20:38:08 UTC (rev 92404)
@@ -77,24 +77,25 @@
       
       @SuppressWarnings("unchecked")
       Fqn<String> fqn = event.getFqn();
-      boolean isBuddy = isBuddyFqn(fqn);
+      boolean isBuddy = isBuddyFqn(fqn); 
+      int baseIdx = getJSessionIndex(fqn, isBuddy);
       
       if (!local 
-            && isFqnSessionRootSized(fqn, isBuddy) 
-            && isFqnForOurWebapp(fqn, isBuddy))
+            && isFqnSessionRootSized(fqn, baseIdx) 
+            && isFqnForOurWebapp(fqn, baseIdx))
       {
          // A session has been invalidated from another node;
          // need to inform manager
-         String sessId = getIdFromFqn(fqn, isBuddy);
+         String sessId = getIdFromFqn(fqn, baseIdx);
          manager_.notifyRemoteInvalidation(sessId);
       }
       else if (local && !isBuddy
-                  && isPossibleInternalPojoFqn(fqn) 
-                  && isFqnForOurWebapp(fqn, isBuddy))
+                  && isPossibleInternalPojoFqn(fqn, baseIdx) 
+                  && isFqnForOurWebapp(fqn, baseIdx))
       {
          // One of our sessions' pojos is modified; need to inform
          // the manager so it can mark the session dirty
-         String sessId = getIdFromFqn(fqn, isBuddy);
+         String sessId = getIdFromFqn(fqn, baseIdx);
          manager_.notifyLocalAttributeModification(sessId);
       }
    }