Skip to content

fix: guard NPE in TopicRouteWrapper when brokerName is absent from the route #10744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yyqdbngt wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −2
Open

fix: guard NPE in TopicRouteWrapper when brokerName is absent from the route #10744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions proxy/src/main/java/org/apache/rocketmq/proxy/service/route/TopicRouteWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,19 @@ public TopicRouteWrapper(TopicRouteData topicRouteData, String topicName) {
}

public String getMasterAddr(String brokerName) {
return this.brokerNameRouteData.get(brokerName).getBrokerAddrs().get(MixAll.MASTER_ID);
BrokerData brokerData = this.brokerNameRouteData.get(brokerName);
if (brokerData == null) {
return null;
}
return brokerData.getBrokerAddrs().get(MixAll.MASTER_ID);
}

public String getMasterAddrPrefer(String brokerName) {
HashMap<Long, String> brokerAddr = brokerNameRouteData.get(brokerName).getBrokerAddrs();
BrokerData brokerData = brokerNameRouteData.get(brokerName);
if (brokerData == null) {
return null;
}
HashMap<Long, String> brokerAddr = brokerData.getBrokerAddrs();
String addr = brokerAddr.get(MixAll.MASTER_ID);
if (addr == null) {
Optional<Long> optional = brokerAddr.keySet().stream().findFirst();
Expand Down