Merge pull request #2058 from RealBar/fix/issue2055

[ISSUE #2055] Fix NPE in SendMessageProcessor.handleRetryAndDLQ
apache · Jul 21, 2021 · c63ec20 · c63ec20
2 parents 765cac3 + 74aa3e0
commit c63ec20
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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 @@ private CompletableFuture<RemotingCommand> asyncConsumerSendMsgBack(ChannelHandl
 
         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