[jboss-cvs] JBossAS SVN: r109312 - projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn.

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

Author: pferraro
Date: 2010-11-13 14:20:16 -0500 (Sat, 13 Nov 2010)
New Revision: 109312

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java
Log:
Now that container name is available via GlobalConfiguration, map containers by name, not cluster name.

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java	2010-11-13 18:53:22 UTC (rev 109311)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java	2010-11-13 19:20:16 UTC (rev 109312)
@@ -88,10 +88,9 @@
             GlobalConfiguration globalConfig = this.container.getGlobalConfiguration();
             
             // Create unique cluster name using cache name
-            String clusterName = globalConfig.getClusterName() + "/" + cacheName;
+            String containerName = this.appendCacheName(globalConfig.getCacheManagerName(), cacheName);
+            EmbeddedCacheManager container = this.containers.get(containerName);
             
-            EmbeddedCacheManager container = this.containers.get(clusterName);
-            
             if (container == null)
             {
                // Workaround for ISPN-744
@@ -101,8 +100,8 @@
                global.setAsyncListenerExecutorProperties(globalConfig.getAsyncListenerExecutorProperties());
                global.setAsyncTransportExecutorFactoryClass(globalConfig.getAsyncTransportExecutorFactoryClass());
                global.setAsyncTransportExecutorProperties(globalConfig.getAsyncTransportExecutorProperties());
-               global.setCacheManagerName(globalConfig.getCacheManagerName() + "/" + cacheName);
-               global.setClusterName(clusterName);
+               global.setCacheManagerName(containerName);
+               global.setClusterName(this.appendCacheName(globalConfig.getClusterName(), cacheName));
                global.setDistributedSyncTimeout(globalConfig.getDistributedSyncTimeout());
                global.setEvictionScheduledExecutorFactoryClass(globalConfig.getEvictionScheduledExecutorFactoryClass());
                global.setEvictionScheduledExecutorProperties(globalConfig.getEvictionScheduledExecutorProperties());
@@ -120,15 +119,15 @@
                global.setStrictPeerToPeer(globalConfig.isStrictPeerToPeer());
                global.setTransportClass(globalConfig.getTransportClass());
                global.setTransportNodeName(globalConfig.getTransportNodeName());
-   
+               
                Properties properties = new Properties(globalConfig.getTransportProperties());
-               properties.setProperty(DefaultCacheContainerFactory.CHANNEL_ID, clusterName);
+               properties.setProperty(DefaultCacheContainerFactory.CHANNEL_ID, global.getClusterName());
                global.setTransportProperties(properties);
                
                // Create single use cache manager
                container = new SingletonCacheManager(this, cacheName, global, config);
                
-               EmbeddedCacheManager existing = this.containers.putIfAbsent(clusterName, container);
+               EmbeddedCacheManager existing = this.containers.putIfAbsent(containerName, container);
                
                if (existing == null)
                {
@@ -159,6 +158,11 @@
       }
    }
 
+   private String appendCacheName(String name, String cacheName)
+   {
+      return name + "/" + cacheName;
+   }
+   
    @Override
    public synchronized void start()
    {
@@ -252,11 +256,11 @@
    @CacheStopped
    public synchronized void cacheStopped(CacheStoppedEvent event)
    {
-      final EmbeddedCacheManager manager = event.getCacheManager();
+      EmbeddedCacheManager container = event.getCacheManager();
       
-      this.containers.remove(manager.getClusterName());
+      this.containers.remove(container.getGlobalConfiguration().getCacheManagerName());
       
-      manager.stop();
+      container.stop();
    }
    
    static class SingletonCacheManager extends DefaultCacheManager