[jboss-cvs] JBossAS SVN: r108869 - 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-10-25 01:18:10 -0400 (Mon, 25 Oct 2010)
New Revision: 108869

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java
Log:
Store lock manager by channel name, not cluster name.

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-10-25 03:46:51 UTC (rev 108868)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java	2010-10-25 05:18:10 UTC (rev 108869)
@@ -62,25 +62,27 @@
    {
       if (!cache.getConfiguration().getCacheMode().isClustered()) return null;
       
-      EmbeddedCacheManager container = (EmbeddedCacheManager) cache.getCacheManager();
-      String clusterName = container.getGlobalConfiguration().getClusterName();
+      JGroupsTransport transport = (JGroupsTransport) cache.getAdvancedCache().getRpcManager().getTransport();
+      Channel channel = transport.getChannel();
+      String channelName = channel.getName();
       
       synchronized (lockManagers)
       {
-         LockManagerEntry entry = lockManagers.get(clusterName);
+         LockManagerEntry entry = lockManagers.get(channelName);
          
          if (entry == null)
          {
-            trace("Starting lock manager for cluster %s", clusterName);
+            trace("Starting lock manager for cluster %s", channelName);
             
-            entry = new LockManagerEntry(cache);
+            entry = new LockManagerEntry(channel);
             
+            EmbeddedCacheManager container = (EmbeddedCacheManager) cache.getCacheManager();
             container.addListener(this);
             
-            lockManagers.put(clusterName, entry);
+            lockManagers.put(channelName, entry);
          }
          
-         trace("Registering %s with lock manager for cluster %s", cache.getName(), clusterName);
+         trace("Registering %s with lock manager for cluster %s", cache.getName(), channelName);
          
          entry.addCache(cache.getName());
          
@@ -94,11 +96,8 @@
       private CoreGroupCommunicationService service;
       private Set<String> caches = new HashSet<String>();
       
-      LockManagerEntry(Cache<?, ?> cache)
+      LockManagerEntry(Channel channel)
       {
-         JGroupsTransport transport = (JGroupsTransport) cache.getAdvancedCache().getRpcManager().getTransport();
-         Channel channel = transport.getChannel();
-         
          this.service = new CoreGroupCommunicationService();
          this.service.setChannel(channel);
          this.service.setScopeId(SCOPE_ID);