[1/2] activemq-artemis git commit: This closes #2264

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: This closes #2264

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 552b7793d -> c2c2ce0a4


This closes #2264


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c2c2ce0a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c2c2ce0a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c2c2ce0a

Branch: refs/heads/master
Commit: c2c2ce0a47aa4665eff2c7d2ebc068c6b5bc96e2
Parents: 552b779 3c3c817
Author: Justin Bertram <[hidden email]>
Authored: Fri Dec 14 18:04:07 2018 -0600
Committer: Justin Bertram <[hidden email]>
Committed: Fri Dec 14 18:04:07 2018 -0600

----------------------------------------------------------------------
 .../artemis/core/server/impl/SharedStoreBackupActivation.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/2] 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

jbertram
[ARTEMIS-2050] It is possible to get AMQ224000: Failure in initialisation: java.lang.NullPointerException during shutdown of backup server with shared store


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3c3c8172
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3c3c8172
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3c3c8172

Branch: refs/heads/master
Commit: 3c3c81720a93e7617fca757dd9df49cd3b590d96
Parents: 552b779
Author: JiriOndrusek <[hidden email]>
Authored: Fri Aug 24 09:14:02 2018 +0200
Committer: Justin Bertram <[hidden email]>
Committed: Fri Dec 14 18:04:07 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/3c3c8172/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) {