[jboss-cvs] JBossAS SVN: r80750 - in projects/cluster: ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-11-10 16:02:31 -0500 (Mon, 10 Nov 2008)
New Revision: 80750

Modified:
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/SessionBasedJBossCacheService.java
   projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManager.java
Log:
[JBAS-6186] Use JBossWebMetaData to drive DistributedCacheManagerFactory

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java	2008-11-10 20:52:44 UTC (rev 80749)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java	2008-11-10 21:02:31 UTC (rev 80750)
@@ -433,23 +433,18 @@
       }
    }
 
-   public void removeSession(String realId, boolean removeRegion)
+   public void removeSession(String realId)
    {
       Fqn fqn = getSessionFqn(combinedPath_, realId);
       if (log_.isTraceEnabled())
       {
          log_.trace("Remove session from distributed store. Fqn: " + fqn);
       }
-      
-      if (removeRegion)
-      {
-         plainCache_.removeRegion(fqn);
-      }
 
       cacheWrapper_.remove(fqn);
    }
 
-   public void removeSessionLocal(String realId, boolean removeRegion)
+   public void removeSessionLocal(String realId)
    {
       Fqn fqn = getSessionFqn(combinedPath_, realId);
       if (log_.isTraceEnabled())
@@ -457,11 +452,6 @@
          log_.trace("Remove session from my own distributed store only. Fqn: " + fqn);
       }
       
-      if (removeRegion)
-      {
-         plainCache_.removeRegion(fqn);
-      }
-      
       cacheWrapper_.removeLocal(fqn);
    }
 
@@ -469,7 +459,7 @@
    {
       if (dataOwner == null)
       {
-         removeSessionLocal(realId, false);
+         removeSessionLocal(realId);
       }
       else
       {         

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java	2008-11-10 20:52:44 UTC (rev 80749)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java	2008-11-10 21:02:31 UTC (rev 80750)
@@ -103,6 +103,24 @@
       }
    }
 
+   @Override
+   public void removeSession(String realId)
+   {
+      super.removeSession(realId);
+      
+      Fqn fqn = getSessionFqn(combinedPath_, realId);
+      getCache().removeRegion(fqn);
+   }
+
+   @Override
+   public void removeSessionLocal(String realId)
+   {
+      super.removeSessionLocal(realId);
+      
+      Fqn fqn = getSessionFqn(combinedPath_, realId);
+      getCache().removeRegion(fqn);
+   }
+
    public boolean getSupportsAttributeOperations()
    {
       return true;

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/SessionBasedJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/SessionBasedJBossCacheService.java	2008-11-10 20:52:44 UTC (rev 80749)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/SessionBasedJBossCacheService.java	2008-11-10 21:02:31 UTC (rev 80750)
@@ -21,6 +21,7 @@
 */
 package org.jboss.web.tomcat.service.session.distributedcache.impl.jbc;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -109,7 +110,8 @@
     */
    protected Map<String, Object> getSessionAttributes(String realId, Map<Object, Object> distributedCacheData)
    {
-      return (Map<String, Object>) getUnMarshalledValue(distributedCacheData.get(ATTRIBUTE_KEY));
+      Map<String, Object> result = (Map<String, Object>) getUnMarshalledValue(distributedCacheData.get(ATTRIBUTE_KEY));
+      return result == null ? Collections.EMPTY_MAP : result;
    }
    
    @Override

Modified: projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManager.java
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManager.java	2008-11-10 20:52:44 UTC (rev 80749)
+++ projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/DistributedCacheManager.java	2008-11-10 21:02:31 UTC (rev 80750)
@@ -77,17 +77,15 @@
     * Globally remove a session from the distributed cache.
     * 
     * @param realId the session's id, excluding any jvmRoute
-    * @param removeRegion FIXME remove
     */
-   void removeSession(String realId, boolean removeRegion);
+   void removeSession(String realId);
 
    /**
     * Remove a session from the distributed cache on this node only.
     * 
     * @param realId the session's id, excluding any jvmRoute
-    * @param removeRegion FIXME remove
     */
-   void removeSessionLocal(String realId, boolean removeRegion);
+   void removeSessionLocal(String realId);
 
    /**
     * Remove a non-locally active session from the distributed cache, but on