(activemq-artemis) branch main updated: ARTEMIS-4698 mitigate NPE when removing metrics

[jb...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new f36e944641 ARTEMIS-4698 mitigate NPE when removing metrics
f36e944641 is described below

commit f36e944641b8642c5acab55c2076871e86f59c70
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Mar 25 13:15:06 2024 -0500

    ARTEMIS-4698 mitigate NPE when removing metrics
---
 .../apache/activemq/artemis/core/server/metrics/MetricsManager.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
index bc688f99cc..da65d59068 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
@@ -168,7 +168,11 @@ public class MetricsManager {
          logger.debug("Unregistering meters for {}", resource);
          for (Meter meter : resourceMeters) {
             Meter removed = meterRegistry.remove(meter);
-            logger.debug("Unregistered meter: {}", removed.getId());
+            if (removed != null) {
+               logger.debug("Unregistered meter: {}", removed.getId());
+            } else {
+               logger.debug("Attempted to unregister meter {}, but it wasn't found in the registry", meter);
+            }
          }
       } else {
          logger.debug("Attempted to unregister meters for {}, but none were found.", resource);