[ISSUE #5947] Optimize RouteInfoManager#pickupTopicRouteData create B…

…rokerData code (#5948)
apache · Feb 16, 2023 · 3f14b2b · 3f14b2b
1 parent 9fc5038
commit 3f14b2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
@@ -678,10 +678,7 @@ public TopicRouteData pickupTopicRouteData(final String topic) {
                     if (null == brokerData) {
                         continue;
                     }
-                    BrokerData brokerDataClone = new BrokerData(brokerData.getCluster(),
-                        brokerData.getBrokerName(),
-                        (HashMap<Long, String>) brokerData.getBrokerAddrs().clone(),
-                        brokerData.isEnableActingMaster(), brokerData.getZoneName());
+                    BrokerData brokerDataClone = new BrokerData(brokerData);
 
                     brokerDataList.add(brokerDataClone);
                     foundBrokerData = true;

diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/route/BrokerData.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/route/BrokerData.java
@@ -55,6 +55,7 @@ public BrokerData(BrokerData brokerData) {
         if (brokerData.brokerAddrs != null) {
             this.brokerAddrs = new HashMap<>(brokerData.brokerAddrs);
         }
+        this.zoneName = brokerData.zoneName;
         this.enableActingMaster = brokerData.enableActingMaster;
     }
 
@@ -64,14 +65,16 @@ public BrokerData(String cluster, String brokerName, HashMap<Long, String> broke
         this.brokerAddrs = brokerAddrs;
     }
 
-    public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs, boolean enableActingMaster) {
+    public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs,
+        boolean enableActingMaster) {
         this.cluster = cluster;
         this.brokerName = brokerName;
         this.brokerAddrs = brokerAddrs;
         this.enableActingMaster = enableActingMaster;
     }
 
-    public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs, boolean enableActingMaster, String zoneName) {
+    public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs, boolean enableActingMaster,
+        String zoneName) {
         this.cluster = cluster;
         this.brokerName = brokerName;
         this.brokerAddrs = brokerAddrs;