You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2018/12/15 01:16:16 UTC
activemq-artemis git commit: [ARTEMIS-2050] It is possible to get
AMQ224000: Failure in initialisation: java.lang.NullPointerException during
shutdown of backup server with shared store
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x 31bcfbbea -> 40f886d98
[ARTEMIS-2050] It is possible to get AMQ224000: Failure in initialisation: java.lang.NullPointerException during shutdown of backup server with shared store
(cherry picked from commit 3c3c81720a93e7617fca757dd9df49cd3b590d96)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/40f886d9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/40f886d9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/40f886d9
Branch: refs/heads/2.6.x
Commit: 40f886d986920166d52d1f23bd61cfc84e4894f3
Parents: 31bcfbb
Author: JiriOndrusek <jo...@redhat.com>
Authored: Fri Aug 24 09:14:02 2018 +0200
Committer: Justin Bertram <jb...@apache.org>
Committed: Fri Dec 14 19:16:03 2018 -0600
----------------------------------------------------------------------
.../artemis/core/server/impl/SharedStoreBackupActivation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40f886d9/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
index 383f93f..c978ff6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
@@ -114,7 +114,7 @@ public final class SharedStoreBackupActivation extends Activation {
activeMQServer.getNodeManager().releaseBackup();
}
- if (sharedStoreSlavePolicy.isAllowAutoFailBack()) {
+ if (sharedStoreSlavePolicy.isAllowAutoFailBack() && ActiveMQServerImpl.SERVER_STATE.STOPPING != activeMQServer.getState() && ActiveMQServerImpl.SERVER_STATE.STOPPED != activeMQServer.getState()) {
startFailbackChecker();
}
} catch (ClosedChannelException | InterruptedException e) {