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

jinrongtong pushed a commit to branch dledger-controller-brokerId
in repository https://gitbox.apache.org/repos/asf/rocketmq.git

commit e71139f182941b1a3fa999c4d255c71afc6199d8
Author: TheR1sing3un <[email protected]>
AuthorDate: Mon Feb 6 13:15:27 2023 +0800

    fix(controller): fix some bug about wrong type comparison
    
    1. fix some bug about wrong type comparison
---
 .../org/apache/rocketmq/controller/elect/impl/DefaultElectPolicy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/controller/src/main/java/org/apache/rocketmq/controller/elect/impl/DefaultElectPolicy.java
 
b/controller/src/main/java/org/apache/rocketmq/controller/elect/impl/DefaultElectPolicy.java
index 22d69c357..f917bf285 100644
--- 
a/controller/src/main/java/org/apache/rocketmq/controller/elect/impl/DefaultElectPolicy.java
+++ 
b/controller/src/main/java/org/apache/rocketmq/controller/elect/impl/DefaultElectPolicy.java
@@ -94,7 +94,7 @@ public class DefaultElectPolicy implements ElectPolicy {
         }
         if (!brokers.isEmpty()) {
             // if old master is still valid, and preferBrokerAddr is blank or 
is equals to oldMaster
-            if (brokers.contains(oldMaster) && (preferBrokerId == null || 
preferBrokerId == oldMaster)) {
+            if (brokers.contains(oldMaster) && (preferBrokerId == null || 
preferBrokerId.equals(oldMaster))) {
                 return oldMaster;
             }
 

Reply via email to