[jboss-cvs] JBossAS SVN: r109204 - 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-08 16:54:24 -0500 (Mon, 08 Nov 2010)
New Revision: 109204

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
Log:
Disable infinispan's jvm shutdown hook.

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2010-11-08 19:57:09 UTC (rev 109203)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2010-11-08 21:54:24 UTC (rev 109204)
@@ -25,6 +25,7 @@
 
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior;
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.remoting.transport.jgroups.JGroupsChannelLookup;
@@ -61,21 +62,23 @@
    @Override
    public EmbeddedCacheManager createCacheContainer(CacheContainerConfiguration configuration)
    {
-      GlobalConfiguration globalConfiguration = configuration.getGlobalConfiguration();
-      if (globalConfiguration.getTransportClass() != null)
+      GlobalConfiguration global = configuration.getGlobalConfiguration();
+      // Don't register shutdown hook - caches/containers will stop when registry stops
+      global.setShutdownHookBehavior(ShutdownHookBehavior.DONT_REGISTER);
+      if (global.getTransportClass() != null)
       {
-         globalConfiguration.setStrictPeerToPeer(false);
-         Properties properties = globalConfiguration.getTransportProperties();
+         global.setStrictPeerToPeer(false);
+         Properties properties = global.getTransportProperties();
          
          if (!properties.containsKey(JGroupsTransport.CHANNEL_LOOKUP))
          {
             properties.put(CHANNEL_FACTORY, this.channelFactory);
-            properties.setProperty(CHANNEL_ID, globalConfiguration.getClusterName());
+            properties.setProperty(CHANNEL_ID, global.getClusterName());
             properties.setProperty(JGroupsTransport.CHANNEL_LOOKUP, ChannelFactoryChannelLookup.class.getName());
          }
       }
 
-      EmbeddedCacheManager manager = new DefaultCacheManager(globalConfiguration, configuration.getDefaultConfiguration(), false);
+      EmbeddedCacheManager manager = new DefaultCacheManager(global, configuration.getDefaultConfiguration(), false);
 
       // Add named configurations
       for (Configuration config: configuration.getNamedConfigurations())