[jboss-cvs] JBossAS SVN: r108059 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn.

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

Author: smarlow at redhat.com
Date: 2010-09-08 17:29:42 -0400 (Wed, 08 Sep 2010)
New Revision: 108059

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java
Log:
trigger SSOEmpty event when reaching zero application sessions for a SSOid

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java	2010-09-08 21:05:36 UTC (rev 108058)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/sso/ispn/SSOClusterManager.java	2010-09-08 21:29:42 UTC (rev 108059)
@@ -515,7 +515,7 @@
 
       // Entire SSO is being removed; i.e. an invalidation
       // Ignore messages generated by our own logout activity
-      // TODO:  can we check event.isOriginLocal instead of beingLocallyRemoved? 
+      // TODO:  can we check event.isOriginLocal instead of beingLocallyRemoved?
       if (!ssoId.equals(beingLocallyRemoved.get()))
       {
          deregisterSSO(ssoId);
@@ -974,13 +974,13 @@
    private void removeSessionFromCache(String ssoId, FullyQualifiedSessionId fullyQualifiedSessionId) throws Exception
    {
       SessionKey key = new SessionKey(ssoId);
-      AtomicMap<FullyQualifiedSessionId, Void> map = this.atomicMapFactory.getAtomicMap(key.cast(this.cache), key, false);
+      AtomicMap<FullyQualifiedSessionId, Void> map = atomicMapFactory.getAtomicMap(key.cast(cache), key, false);
       if (map != null)
       {
          map.remove(fullyQualifiedSessionId);
-         if(map.size() == 0)  // last session removed, also remove the credentials
+         if(map.size() == 0)  // last session removed, send signal that credentials can be removed after maxEmptyLife
          {
-            removeSSOFromCache(ssoId);
+            notifySSOEmpty(ssoId);
          }
       }
       else if (log.isTraceEnabled())