ISPN-1388 All executors should be shutdown centrally

infinispan · Sep 16, 2011 · bff5a04 · bff5a04
1 parent 861d412
commit bff5a04
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java b/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
@@ -202,7 +202,13 @@ public void stop() {
             l.cacheManagerStopping(this);
          }
       }
+
+      // Grab the executor factory
+      NamedExecutorsFactory execFactory = getComponent(NamedExecutorsFactory.class);
       super.stop();
+      // Now that all components are stopped, shutdown their executors
+      execFactory.stop();
+
       if (state == ComponentStatus.TERMINATED && needToNotify) {
          for (ModuleLifecycle l : moduleLifecycles) {
             l.cacheManagerStopped(this);

diff --git a/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java b/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
@@ -100,6 +100,13 @@ public <T> T construct(Class<T> componentType, String componentName) {
       }
    }
 
+   public void stop() {
+      if (notificationExecutor != null) notificationExecutor.shutdownNow();
+      if (asyncTransportExecutor != null) asyncTransportExecutor.shutdownNow();
+      if (asyncReplicationExecutor != null) asyncReplicationExecutor.shutdownNow();
+      if (evictionExecutor != null) evictionExecutor.shutdownNow();
+   }
+
    private ExecutorService buildAndConfigureExecutorService(String factoryName, Properties p, String componentName) throws Exception {
       Properties props = new Properties(p); // defensive copy
       if (p != null && !p.isEmpty()) props.putAll(p);

diff --git a/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java b/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
@@ -80,7 +80,6 @@ void stop() {
       }
 
       if (syncProcessor != null) syncProcessor.shutdownNow();
-      if (asyncProcessor != null) asyncProcessor.shutdownNow();
    }
 
    protected abstract Log getLog();

diff --git a/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java b/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
@@ -115,11 +115,6 @@ private void start() {
       statisticsEnabled = configuration.isExposeJmxStatistics();
    }
 
-   @Stop(priority = 9)
-   private void stop() {
-      asyncExecutor.shutdown();
-   }
-
    private boolean useReplicationQueue(boolean sync) {
       return !sync && replicationQueue != null && replicationQueue.isEnabled();
    }

diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
@@ -217,8 +217,6 @@ public void stop() {
          dispatcher.stop();
       }
 
-      asyncExecutor.shutdown();
-
       members = Collections.emptyList();
       coordinator = false;
       dispatcher = null;