You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2022/06/29 01:32:19 UTC

[rocketmq] branch develop updated: [ISSUE #4513] elegant equals using apache-commons (#4514)

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

duhengforever pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 364494166 [ISSUE #4513] elegant equals using apache-commons (#4514)
364494166 is described below

commit 364494166daec2711455aa0768990997eb692d8e
Author: Panson <Pa...@163.com>
AuthorDate: Wed Jun 29 09:31:55 2022 +0800

    [ISSUE #4513] elegant equals using apache-commons (#4514)
---
 .../org/apache/rocketmq/common/protocol/route/BrokerData.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java b/common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java
index 36599fbc8..50c789363 100644
--- a/common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java
+++ b/common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java
@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.MixAll;
 
 public class BrokerData implements Comparable<BrokerData> {
@@ -96,12 +98,7 @@ public class BrokerData implements Comparable<BrokerData> {
                 return false;
         } else if (!brokerAddrs.equals(other.brokerAddrs))
             return false;
-        if (brokerName == null) {
-            if (other.brokerName != null)
-                return false;
-        } else if (!brokerName.equals(other.brokerName))
-            return false;
-        return true;
+        return StringUtils.equals(brokerName, other.brokerName);
     }
 
     @Override