Skip to content

[ISSUE #10419] Fix NPE when class filter route data is missing #10420

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
yin-bo-Final wants to merge 2 commits into
base: develop
Choose a base branch
from
+68 −3
Open

[ISSUE #10419] Fix NPE when class filter route data is missing #10420

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
2445987
[ISSUE #10419] Fix NPE when class filter route data is missing
yin-bo-Final Jun 2, 2026
65c20fc
[ISSUE #10419] Add class filter route fallback tests
yin-bo-Final Jun 5, 2026
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
8 changes: 5 additions & 3 deletions client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,12 @@ private String computePullFromWhichFilterServer(final String topic, final String
ConcurrentMap<String, TopicRouteData> topicRouteTable = this.mQClientFactory.getTopicRouteTable();
if (topicRouteTable != null) {
TopicRouteData topicRouteData = topicRouteTable.get(topic);
List<String> list = topicRouteData.getFilterServerTable().get(brokerAddr);
if (topicRouteData != null && topicRouteData.getFilterServerTable() != null) {
List<String> list = topicRouteData.getFilterServerTable().get(brokerAddr);

if (list != null && !list.isEmpty()) {
return list.get(randomNum() % list.size());
if (list != null && !list.isEmpty()) {
return list.get(randomNum() % list.size());
}
}
}

Expand Down
63 changes: 63 additions & 0 deletions client/src/test/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
Expand Down Expand Up @@ -153,6 +154,68 @@ public void testPullKernelImpl() throws Exception {
any(PullCallback.class));
}

@Test
public void testPullKernelImplWithMissingTopicRouteDataForClassFilter() {
when(mQClientFactory.getTopicRouteTable()).thenReturn(new ConcurrentHashMap<>());

assertFindFilterServerFailed();
}

@Test
public void testPullKernelImplWithMissingFilterServerTableForClassFilter() {
TopicRouteData topicRouteData = new TopicRouteData();
topicRouteData.setFilterServerTable(null);
ConcurrentMap<String, TopicRouteData> topicRouteTable = new ConcurrentHashMap<>();
topicRouteTable.put(defaultTopic, topicRouteData);
when(mQClientFactory.getTopicRouteTable()).thenReturn(topicRouteTable);

assertFindFilterServerFailed();
}

@Test
public void testPullKernelImplWithMissingBrokerFilterServerForClassFilter() {
TopicRouteData topicRouteData = new TopicRouteData();
topicRouteData.setFilterServerTable(new HashMap<>());
ConcurrentMap<String, TopicRouteData> topicRouteTable = new ConcurrentHashMap<>();
topicRouteTable.put(defaultTopic, topicRouteData);
when(mQClientFactory.getTopicRouteTable()).thenReturn(topicRouteTable);

assertFindFilterServerFailed();
}

@Test
public void testPullKernelImplWithEmptyFilterServerListForClassFilter() {
TopicRouteData topicRouteData = new TopicRouteData();
HashMap<String, List<String>> filterServerTable = new HashMap<>();
filterServerTable.put(defaultBrokerAddr, new ArrayList<>());
topicRouteData.setFilterServerTable(filterServerTable);
ConcurrentMap<String, TopicRouteData> topicRouteTable = new ConcurrentHashMap<>();
topicRouteTable.put(defaultTopic, topicRouteData);
when(mQClientFactory.getTopicRouteTable()).thenReturn(topicRouteTable);

assertFindFilterServerFailed();
}

private void assertFindFilterServerFailed() {
MQClientException actual = assertThrows(MQClientException.class, () -> pullAPIWrapper.pullKernelImpl(
createMessageQueue(),
"",
"",
1L,
1L,
1,
1,
PullSysFlag.buildSysFlag(false, false, false, true),
1L,
System.currentTimeMillis(),
defaultTimeout,
CommunicationMode.SYNC,
null
));

assertTrue(actual.getMessage().contains("Find Filter Server Failed"));
}

@Test
public void testSetConnectBrokerByUser() {
pullAPIWrapper.setConnectBrokerByUser(true);
Expand Down
Loading