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

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

Author: pferraro
Date: 2010-11-15 14:12:25 -0500 (Mon, 15 Nov 2010)
New Revision: 109343

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java
Log:
Use LockManagerEntry instance as cache listener - this ensures we call removeListener(...) on the same object on which we called addListener(...).

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java	2010-11-15 16:24:51 UTC (rev 109342)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java	2010-11-15 19:12:25 UTC (rev 109343)
@@ -54,7 +54,7 @@
    static final Logger log = Logger.getLogger(DefaultLockManagerSource.class);
    
    // Store LockManagers in static map so they can be shared across DCMs
-   private static final Map<String, LockManagerEntry> lockManagers = new HashMap<String, LockManagerEntry>();
+   static final Map<String, LockManagerEntry> lockManagers = new HashMap<String, LockManagerEntry>();
    
    // Need to cast since ContextClassLoaderSwitcher.NewInstance does not generically implement PrivilegedAction<ContextClassLoaderSwitcher>
    @SuppressWarnings("unchecked")
@@ -93,7 +93,7 @@
             
             debug("Started lock manager for \"%s\" container", containerName);
             
-            container.addListener(this);
+            container.addListener(entry);
             
             lockManagers.put(containerName, entry);
          }
@@ -108,7 +108,8 @@
       }
    }
    
-   private static class LockManagerEntry
+   @Listener
+   public static class LockManagerEntry
    {
       private final SharedLocalYieldingClusterLockManager lockManager;
       private final CoreGroupCommunicationService service;
@@ -180,38 +181,38 @@
          
          return empty;
       }
-   }
-   
-   @CacheStopped
-   public void stopped(CacheStoppedEvent event)
-   {
-      EmbeddedCacheManager container = event.getCacheManager();
-      String containerName = container.getGlobalConfiguration().getCacheManagerName();
       
-      synchronized (lockManagers)
+      @CacheStopped
+      public void stopped(CacheStoppedEvent event)
       {
-         LockManagerEntry entry = lockManagers.get(containerName);
+         EmbeddedCacheManager container = event.getCacheManager();
+         String containerName = container.getGlobalConfiguration().getCacheManagerName();
          
-         if (entry != null)
+         synchronized (lockManagers)
          {
-            String cacheName = event.getCacheName();
-
-            debug("Deregistering \"%s\" cache from lock manager for \"%s\" container", cacheName, containerName);
+            LockManagerEntry entry = lockManagers.get(containerName);
             
-            // Returns true if this was the last cache
-            if (entry.removeCache(cacheName))
+            if (entry != null)
             {
-               debug("Stopped lock manager for \"%s\" container", containerName);
+               String cacheName = event.getCacheName();
+
+               debug("Deregistering \"%s\" cache from lock manager for \"%s\" container", cacheName, containerName);
                
-               lockManagers.remove(containerName);
-               
-               container.removeListener(this);
+               // Returns true if this was the last cache
+               if (entry.removeCache(cacheName))
+               {
+                  debug("Stopped lock manager for \"%s\" container", containerName);
+                  
+                  lockManagers.remove(containerName);
+                  
+                  container.removeListener(entry);
+               }
             }
          }
       }
    }
    
-   private static void debug(String message, Object... args)
+   static void debug(String message, Object... args)
    {
       log.debug(String.format(message, args));
    }