Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #372 ARTEMIS-376 NPE on Failback

This commit is contained in:
Clebert Suconic 2016-02-04 15:53:07 -05:00
parent 33b1f7275c 5a483f922a
commit de4e2cfe3a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
View File

@ -51,6 +51,7 @@ import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class SharedNothingLiveActivation extends LiveActivation { public class SharedNothingLiveActivation extends LiveActivation {
@ -229,17 +230,20 @@ public class SharedNothingLiveActivation extends LiveActivation {
@Override @Override
public void connectionClosed() { public void connectionClosed() {
activeMQServer.getThreadPool().execute(new Runnable() { ExecutorService executorService = activeMQServer.getThreadPool();
@Override if (executorService != null) {
public void run() { executorService.execute(new Runnable() {
synchronized (replicationLock) { @Override
if (replicationManager != null) { public void run() {
activeMQServer.getStorageManager().stopReplication(); synchronized (replicationLock) {
replicationManager = null; if (replicationManager != null) {
activeMQServer.getStorageManager().stopReplication();
replicationManager = null;
}
} }
} }
} });
}); }
} }
} }