From 832bd85941cdba0e8fb33a1ba42bc98dc64610c7 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 7 Jul 2020 12:21:34 -0400 Subject: [PATCH] ARTEMIS-2828 Fixing tests after main change on ManagementServiceImpl This is almost a NO-JIRA, but since I'm fixing ManagementServiceImplTest.testGetResources broken after this I'm commiting this change associated with ARTEMIS-2828 --- .../management/impl/ManagementServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 6e8667743a..0ae387fbe8 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 @@ -263,13 +263,15 @@ public class ManagementServiceImpl implements ManagementService { @Override public void registerAddressMeters(AddressInfo addressInfo, AddressControl addressControl) { - MetricsManager metricsManager = messagingServer.getMetricsManager(); - if (metricsManager != null) { - metricsManager.registerAddressGauge(addressInfo.getName().toString(), builder -> { - builder.register(AddressMetricNames.ROUTED_MESSAGE_COUNT, this, metrics -> Double.valueOf(addressInfo.getRoutedMessageCount()), AddressControl.ROUTED_MESSAGE_COUNT_DESCRIPTION); - builder.register(AddressMetricNames.UNROUTED_MESSAGE_COUNT, this, metrics -> Double.valueOf(addressInfo.getUnRoutedMessageCount()), AddressControl.UNROUTED_MESSAGE_COUNT_DESCRIPTION); - builder.register(AddressMetricNames.ADDRESS_SIZE, this, metrics -> Double.valueOf(addressControl.getAddressSize()), AddressControl.ADDRESS_SIZE_DESCRIPTION); - }); + if (messagingServer != null) { // it could be null on tests, but never on a real server + MetricsManager metricsManager = messagingServer.getMetricsManager(); + if (metricsManager != null) { + metricsManager.registerAddressGauge(addressInfo.getName().toString(), builder -> { + builder.register(AddressMetricNames.ROUTED_MESSAGE_COUNT, this, metrics -> Double.valueOf(addressInfo.getRoutedMessageCount()), AddressControl.ROUTED_MESSAGE_COUNT_DESCRIPTION); + builder.register(AddressMetricNames.UNROUTED_MESSAGE_COUNT, this, metrics -> Double.valueOf(addressInfo.getUnRoutedMessageCount()), AddressControl.UNROUTED_MESSAGE_COUNT_DESCRIPTION); + builder.register(AddressMetricNames.ADDRESS_SIZE, this, metrics -> Double.valueOf(addressControl.getAddressSize()), AddressControl.ADDRESS_SIZE_DESCRIPTION); + }); + } } }