ARTEMIS-376 NPE during fail-back
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5a483f92 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5a483f92 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5a483f92 Branch: refs/heads/refactor-openwire Commit: 5a483f922a63729f4d16904c6ea4f985c9a49b41 Parents: 33b1f72 Author: jbertram <[email protected]> Authored: Thu Feb 4 14:20:02 2016 -0600 Committer: jbertram <[email protected]> Committed: Thu Feb 4 14:20:02 2016 -0600 ---------------------------------------------------------------------- .../impl/SharedNothingLiveActivation.java | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5a483f92/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java index 299df00..76730a0 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java @@ -51,6 +51,7 @@ import org.apache.activemq.artemis.spi.core.remoting.Acceptor; 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 class SharedNothingLiveActivation extends LiveActivation { @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; + } } } - } - }); + }); + } } }
