You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by hz...@apache.org on 2022/08/08 09:11:34 UTC
[rocketmq] branch develop updated: [ISSUE #4794] Fix deserialize ElectMasterResponseHeader attribute value of brokerMemberGroup is null (#4796)
This is an automated email from the ASF dual-hosted git repository.
hzh0425 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 ce274265d [ISSUE #4794] Fix deserialize ElectMasterResponseHeader attribute value of brokerMemberGroup is null (#4796)
ce274265d is described below
commit ce274265db8af73e28624ecc1fc98cc984658844
Author: mxsm <lj...@gmail.com>
AuthorDate: Mon Aug 8 17:11:14 2022 +0800
[ISSUE #4794] Fix deserialize ElectMasterResponseHeader attribute value of brokerMemberGroup is null (#4796)
---
.../org/apache/rocketmq/common/protocol/body/BrokerMemberGroup.java | 3 ++-
.../rocketmq/controller/impl/manager/ReplicasInfoManager.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/body/BrokerMemberGroup.java b/common/src/main/java/org/apache/rocketmq/common/protocol/body/BrokerMemberGroup.java
index eb02f8867..7e24da364 100644
--- a/common/src/main/java/org/apache/rocketmq/common/protocol/body/BrokerMemberGroup.java
+++ b/common/src/main/java/org/apache/rocketmq/common/protocol/body/BrokerMemberGroup.java
@@ -21,8 +21,9 @@ import com.google.common.base.Objects;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
-public class BrokerMemberGroup {
+public class BrokerMemberGroup extends RemotingSerializable {
private String cluster;
private String brokerName;
private Map<Long/* brokerId */, String/* broker address */> brokerAddrs;
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
index be53e2d87..a53c7ca9d 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
@@ -211,8 +211,10 @@ public class ReplicasInfoManager {
response.setNewMasterAddress(candidate);
response.setMasterEpoch(masterEpoch + 1);
response.setSyncStateSetEpoch(syncStateSetEpoch);
- response.setBrokerMemberGroup(buildBrokerMemberGroup(brokerName));
-
+ BrokerMemberGroup brokerMemberGroup = buildBrokerMemberGroup(brokerName);
+ if (null != brokerMemberGroup) {
+ result.setBody(brokerMemberGroup.encode());
+ }
final ElectMasterEvent event = new ElectMasterEvent(brokerName, candidate);
result.addEvent(event);
return true;