NO-JIRA avoiding a NPE if the server is stopped

(cherry picked from commit 77989c3)
apache · Aug 7, 2018 · 548459f · 548459f
1 parent cddedae
commit 548459f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...n/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/...n/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -550,7 +550,10 @@ public void start() throws Exception {
          @Override
          public void activated() {
             try {
-               messagingServer.addAddressInfo(new AddressInfo(managementNotificationAddress, RoutingType.MULTICAST));
+               ActiveMQServer usedServer = messagingServer;
+               if (usedServer != null) {
+                  usedServer.addAddressInfo(new AddressInfo(managementNotificationAddress, RoutingType.MULTICAST));
+               }
             } catch (Exception e) {
                ActiveMQServerLogger.LOGGER.unableToCreateManagementNotificationAddress(managementNotificationAddress, e);
             }