[activemq-artemis] branch master updated: ARTEMIS-2828 Fixing tests after main change 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 832bd85  ARTEMIS-2828 Fixing tests after main change on 
ManagementServiceImpl
832bd85 is described below

commit 832bd85941cdba0e8fb33a1ba42bc98dc64610c7
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Tue Jul 7 12:21:34 2020 -0400

    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
---
 .../server/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 6e86677..0ae387f 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);
+            });
+         }
       }
    }