Skip to content

[Bug] Fix potential NPE in EscapeBridge when topicPublishInfo is null #10232

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

[Bug] Fix potential NPE in EscapeBridge when topicPublishInfo is null #10232

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
10 changes: 10 additions & 0 deletions broker/src/main/java/org/apache/rocketmq/broker/failover/EscapeBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ public CompletableFuture<PutMessageResult> asyncPutMessage(MessageExtBrokerInner
messageExt.setWaitStoreMsgOK(false);

final TopicPublishInfo topicPublishInfo = this.brokerController.getTopicRouteInfoManager().tryToFindTopicPublishInfo(messageExt.getTopic());
if (null == topicPublishInfo || !topicPublishInfo.ok()) {
LOG.warn("asyncPutMessage: no route info of topic {} when escaping message, msgId={}",
messageExt.getTopic(), messageExt.getMsgId());
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.PUT_TO_REMOTE_BROKER_FAIL, null, true));
}
final String producerGroup = getProducerGroup(messageExt);

final MessageQueue mqSelected = topicPublishInfo.selectOneMessageQueue();
Expand Down Expand Up @@ -250,6 +255,11 @@ public CompletableFuture<PutMessageResult> asyncRemotePutMessageToSpecificQueue(
messageExt.setWaitStoreMsgOK(false);

final TopicPublishInfo topicPublishInfo = this.brokerController.getTopicRouteInfoManager().tryToFindTopicPublishInfo(messageExt.getTopic());
if (null == topicPublishInfo || !topicPublishInfo.ok()) {
LOG.warn("asyncRemotePutMessageToSpecificQueue: no route info of topic {} when escaping message, msgId={}",
messageExt.getTopic(), messageExt.getMsgId());
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.PUT_TO_REMOTE_BROKER_FAIL, null, true));
}
List<MessageQueue> mqs = topicPublishInfo.getMessageQueueList();

if (null == mqs || mqs.isEmpty()) {
Expand Down