[ISSUE #10216] Fix potential NPE in EscapeBridge when topicPublishInfo is null#10217
Open
daguimu wants to merge 1 commit intoapache:developfrom
Open
[ISSUE #10216] Fix potential NPE in EscapeBridge when topicPublishInfo is null#10217daguimu wants to merge 1 commit intoapache:developfrom
daguimu wants to merge 1 commit intoapache:developfrom
Conversation
…ishInfo is null Fixes apache#10216
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
EscapeBridge.asyncPutMessage()andasyncRemotePutMessageToSpecificQueue()dereference the return value oftryToFindTopicPublishInfo()without null checks, causing NullPointerException when topic route information is unavailable.Root Cause
tryToFindTopicPublishInfo()can return null when the topic route is not yet available (e.g., during broker startup or after nameserver disconnection). TheputMessageToRemoteBroker()method in the same class already handles this correctly with a null/validity check, butasyncPutMessage()andasyncRemotePutMessageToSpecificQueue()were missing this guard.Fix
asyncPutMessage(): Addnull == topicPublishInfo || !topicPublishInfo.ok()check before callingselectOneMessageQueue(), returningPUT_TO_REMOTE_BROKER_FAILwith a warning log, consistent withputMessageToRemoteBroker().asyncRemotePutMessageToSpecificQueue(): Add the same null/validity check before callinggetMessageQueueList().Tests Added
asyncPutMessage()testAsyncPutMessageWhenTopicPublishInfoIsNull()— verifies PUT_TO_REMOTE_BROKER_FAIL when info is nullasyncPutMessage()testAsyncPutMessageWhenTopicPublishInfoNotOk()— verifies same result when info has no queuesasyncRemotePutMessageToSpecificQueue()testAsyncRemotePutMessageToSpecificQueueWhenTopicPublishInfoIsNull()— verifies safe handlingasyncRemotePutMessageToSpecificQueue()testAsyncRemotePutMessageToSpecificQueueWhenTopicPublishInfoNotOk()— verifies same resultImpact
Only affects the escape bridge failover path when slave acts as master. Normal message put operations are unaffected. The fix makes error handling consistent across all methods in
EscapeBridge.Fixes #10216