You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/03/23 02:20:24 UTC

[activemq-artemis] branch master updated: ARTEMIS-3195 Filter empty items from listNetworkTopology

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 4473758  ARTEMIS-3195 Filter empty items from listNetworkTopology
     new 7c5ef27  This closes #3505
4473758 is described below

commit 4473758edb400e1f815e13c33431d189e39610df
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Mon Mar 22 09:06:04 2021 +0100

    ARTEMIS-3195 Filter empty items from listNetworkTopology
---
 .../artemis/core/management/impl/ActiveMQServerControlImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index b1783a6..67f9281 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -4043,16 +4043,16 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
                Collection<TopologyMemberImpl> members = topology.getMembers();
                for (TopologyMemberImpl member : members) {
 
-                  JsonObjectBuilder obj = JsonLoader.createObjectBuilder();
                   TransportConfiguration live = member.getLive();
                   if (live != null) {
+                     JsonObjectBuilder obj = JsonLoader.createObjectBuilder();
                      obj.add("nodeID", member.getNodeId()).add("live", live.getParams().get("host") + ":" + live.getParams().get("port"));
                      TransportConfiguration backup = member.getBackup();
                      if (backup != null) {
                         obj.add("backup", backup.getParams().get("host") + ":" + backup.getParams().get("port"));
                      }
+                     brokers.add(obj);
                   }
-                  brokers.add(obj);
                }
             }
          }