Skip to content

Fixed NullPointerException in CommandUtil.fetchBrokerNameByAddr #9824

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixed NullPointerException in CommandUtil.fetchBrokerNameByAddr #9824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0372513
Fixed NullPointerException in CommandUtil.fetchBrokerNameByAddr
Nov 7, 2025
6daf682
Changed assertThatThrownBy to comply with checkstyle rules
Nov 11, 2025
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
2 changes: 1 addition & 1 deletion tools/src/main/java/org/apache/rocketmq/tools/command/CommandUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public static String fetchBrokerNameByAddr(final MQAdminExt adminExt, final Stri
while (it.hasNext()) {
Map.Entry<String, BrokerData> entry = it.next();
HashMap<Long, String> brokerAddrs = entry.getValue().getBrokerAddrs();
if (brokerAddrs.containsValue(addr)) {
if (brokerAddrs != null && brokerAddrs.containsValue(addr)) {
return entry.getKey();
}
}
Expand Down
9 changes: 9 additions & 0 deletions tools/src/test/java/org/apache/rocketmq/tools/command/CommandUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -101,6 +102,14 @@ public void testFetchMasterAddrByClusterName() throws InterruptedException, MQBr
assertThat(result.size()).isEqualTo(0);
}

@Test
public void testFetchBrokerNameByAddrThrowsCorrectExceptionWhenNothingFound() {
assertThatThrownBy(() -> CommandUtil.fetchBrokerNameByAddr(defaultMQAdminExtImpl, "127.0.0.2:10911"))
.isInstanceOf(Exception.class)
.hasMessageContaining("Make sure the specified clusterName exists or the name server connected to is correct.");

}

@Test
public void testFetchBrokerNameByClusterName() throws Exception {
Set<String> result = CommandUtil.fetchBrokerNameByClusterName(defaultMQAdminExtImpl, "default-cluster");
Expand Down
Loading