[activemq-artemis] branch master updated: NO-JIRA Avoiding NPE on ManagementServiceImpl

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 372220a  NO-JIRA Avoiding NPE on ManagementServiceImpl
372220a is described below

commit 372220ad3fc03976f01428202cfe5210fb353222
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Tue Dec 22 13:12:15 2020 -0500

    NO-JIRA Avoiding NPE on ManagementServiceImpl
---
 .../core/server/management/impl/ManagementServiceImpl.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 7a03754..c5a49fa 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -363,9 +363,11 @@ public class ManagementServiceImpl implements 
ManagementService {
    }
 
    private void unregisterMeters(final String name) {
-      MetricsManager metricsManager = messagingServer.getMetricsManager();
-      if (metricsManager != null) {
-         metricsManager.remove(name);
+      if (messagingServer != null) {
+         MetricsManager metricsManager = messagingServer.getMetricsManager();
+         if (metricsManager != null) {
+            metricsManager.remove(name);
+         }
       }
    }