From ba1c83e1ed6f974d4f96a6a04aea16feb3c1de85 Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@apache.org>
Date: Tue, 13 Dec 2016 21:08:36 -0600
Subject: [PATCH] Fix BackupAuthenticationTest

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

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 097118fea6..3d8b9a9917 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);
    }