Merge pull request #2058 from RealBar/fix/issue2055

[ISSUE #2055] Fix NPE in SendMessageProcessor.handleRetryAndDLQ

Merge pull request #2058 from RealBar/fix/issue2055
[ISSUE #2055] Fix NPE in SendMessageProcessor.handleRetryAndDLQ
c63ec20d · Heng Du · GitHub · 765cac3d · 74aa3e00 · c63ec20d
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java ...pache/rocketmq/broker/processor/SendMessageProcessor.java +4 -1

未找到文件。
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
@@ -178,7 +178,10 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement

        int maxReconsumeTimes = subscriptionGroupConfig.getRetryMaxTimes();
        if (request.getVersion() >= MQVersion.Version.V3_4_9.ordinal()) {
-            maxReconsumeTimes = requestHeader.getMaxReconsumeTimes();
+            Integer times = requestHeader.getMaxReconsumeTimes();
+            if (times != null) {
+                maxReconsumeTimes = times;
+            }
        }

        if (msgExt.getReconsumeTimes() >= maxReconsumeTimes