ARTEMIS-376 NPE during fail-back

apache · Feb 4, 2016 · 5a483f9 · 5a483f9
1 parent 33b1f72
commit 5a483f9
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/...c/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java b/...c/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
@@ -51,6 +51,7 @@
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
 public class SharedNothingLiveActivation extends LiveActivation {
@@ -229,17 +230,20 @@ public void connectionFailed(final ActiveMQException me, boolean failedOver, Str
 
       @Override
       public void connectionClosed() {
-         activeMQServer.getThreadPool().execute(new Runnable() {
-            @Override
-            public void run() {
-               synchronized (replicationLock) {
-                  if (replicationManager != null) {
-                     activeMQServer.getStorageManager().stopReplication();
-                     replicationManager = null;
+         ExecutorService executorService = activeMQServer.getThreadPool();
+         if (executorService != null) {
+            executorService.execute(new Runnable() {
+               @Override
+               public void run() {
+                  synchronized (replicationLock) {
+                     if (replicationManager != null) {
+                        activeMQServer.getStorageManager().stopReplication();
+                        replicationManager = null;
+                     }
                   }
                }
-            }
-         });
+            });
+         }
       }
    }