Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,16 @@ public static TopicPublishInfo topicRouteData2TopicPublishInfo(final String topi
if (route.getOrderTopicConf() != null && route.getOrderTopicConf().length() > 0) {
String[] brokers = route.getOrderTopicConf().split(";");
for (String broker : brokers) {
String[] item = broker.split(":");
int nums = Integer.parseInt(item[1]);
String[] item = broker.split(":", 2);
if (item.length != 2) {
continue;
}
int nums;
try {
nums = Integer.parseInt(item[1]);
} catch (NumberFormatException e) {
continue;
}
for (int i = 0; i < nums; i++) {
MessageQueue mq = new MessageQueue(topic, item[0], i);
info.getMessageQueueList().add(mq);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,17 @@ public void testTopicRouteData2TopicPublishInfoWithOrderTopicConf() {
assertEquals(4, actual.getMessageQueueList().size());
}

@Test
public void testTopicRouteData2TopicPublishInfoSkipsMalformedOrderTopicConf() {
TopicRouteData topicRouteData = createTopicRouteData();
topicRouteData.setOrderTopicConf("missing-count;invalid:not-a-number;127.0.0.1:2");

TopicPublishInfo actual = MQClientInstance.topicRouteData2TopicPublishInfo(topic, topicRouteData);

assertTrue(actual.isOrderTopic());
assertEquals(2, actual.getMessageQueueList().size());
}

@Test
public void testTopicRouteData2TopicPublishInfoWithTopicQueueMappingByBroker() {
TopicRouteData topicRouteData = createTopicRouteData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,22 @@ private static List<AddressableMessageQueue> buildWrite(TopicRouteWrapper topicR
if (StringUtils.isNotBlank(topicRoute.getOrderTopicConf())) {
String[] brokers = topicRoute.getOrderTopicConf().split(";");
for (String broker : brokers) {
String[] item = broker.split(":");
String[] item = broker.split(":", 2);
if (item.length != 2) {
continue;
}
String brokerName = item[0];
String brokerAddr = topicRoute.getMasterAddr(brokerName);
if (brokerAddr == null) {
continue;
}

int nums = Integer.parseInt(item[1]);
int nums;
try {
nums = Integer.parseInt(item[1]);
} catch (NumberFormatException e) {
continue;
}
for (int i = 0; i < nums; i++) {
AddressableMessageQueue mq = new AddressableMessageQueue(
new MessageQueue(topicRoute.getTopicName(), brokerName, i),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,14 @@ public void testWriteMessageQueue() {
messageQueueSelector.selectOne(false);
assertEquals(queue, messageQueueSelector.selectOne(false));
}
}

@Test
public void testWriteMessageQueueSkipsMalformedOrderTopicConf() {
topicRouteData.setOrderTopicConf("missing-count;" + BROKER_NAME + ":not-a-number;" + BROKER_NAME + ":2");

MessageQueueSelector messageQueueSelector =
new MessageQueueSelector(new TopicRouteWrapper(topicRouteData, TOPIC), false);

assertEquals(2, messageQueueSelector.getQueues().size());
}
}
Loading