activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [6/7] activemq-artemis git commit: Fix BackupAuthenticationTest
Date Wed, 14 Dec 2016 14:24:43 GMT
Fix BackupAuthenticationTest


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

Branch: refs/heads/master
Commit: ba1c83e1ed6f974d4f96a6a04aea16feb3c1de85
Parents: 8263ef2
Author: jbertram <jbertram@apache.org>
Authored: Tue Dec 13 21:08:36 2016 -0600
Committer: jbertram <jbertram@apache.org>
Committed: Tue Dec 13 21:08:36 2016 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ba1c83e1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 097118f..3d8b9a9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -601,7 +601,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
    }
 
    public void resetNodeManager() throws Exception {
-      nodeManager.stop();
+      if (nodeManager != null) {
+         nodeManager.stop();
+      }
       nodeManager = createNodeManager(configuration.getJournalLocation(), true);
    }
 


Mime
View raw message