[rocketmq] branch develop updated: [ISSUE #4708] Fix potential NPE in EscapeBridge

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 736409bd3 [ISSUE #4708] Fix potential NPE in EscapeBridge
736409bd3 is described below

commit 736409bd3745330b71be7f1700293150239ec09e
Author: Oliver <wq...@163.com>
AuthorDate: Fri Jul 29 10:19:48 2022 +0800

    [ISSUE #4708] Fix potential NPE in EscapeBridge
---
 .../main/java/org/apache/rocketmq/broker/failover/EscapeBridge.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/broker/src/main/java/org/apache/rocketmq/broker/failover/EscapeBridge.java b/broker/src/main/java/org/apache/rocketmq/broker/failover/EscapeBridge.java
index c7f10a2e3..42a8a639a 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/failover/EscapeBridge.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/failover/EscapeBridge.java
@@ -211,6 +211,10 @@ public class EscapeBridge {
         MessageStore messageStore = brokerController.getMessageStoreByBrokerName(brokerName);
         if (messageStore != null) {
             final GetMessageResult getMessageTmpResult = messageStore.getMessage(innerConsumerGroupName, topic, queueId, offset, 1, null);
+            if (getMessageTmpResult == null) {
+                LOG.warn("getMessageResult is null , innerConsumerGroupName {}, topic {}, offset {}, queueId {}", innerConsumerGroupName, topic, offset, queueId);
+                return null;
+            }
             List<MessageExt> list = decodeMsgList(getMessageTmpResult);
             if (list == null || list.isEmpty()) {
                 LOG.warn("Can not get msg , topic {}, offset {}, queueId {}, result is {}", topic, offset, queueId, getMessageTmpResult);