This closes #372 ARTEMIS-376 NPE on Failback

This commit is contained in:
Clebert Suconic 2016-02-04 15:53:07 -05:00
commit de4e2cfe3a
1 changed files with 13 additions and 9 deletions

View File

@ -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;
}
}
}
}
});
});
}
}
}