[rocketmq] branch develop updated: [ISSUE #7412] Fix pop revive message error when reput checkpoint

[kaili]

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

kaili 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 0027a1486d [ISSUE #7412] Fix pop revive message error when reput 
checkpoint
0027a1486d is described below

commit 0027a1486d4f2d6f7dce3010751167e883783945
Author: redlsz <szliu0...@gmail.com>
AuthorDate: Mon Oct 9 16:52:10 2023 +0800

    [ISSUE #7412] Fix pop revive message error when reput checkpoint
---
 .../main/java/org/apache/rocketmq/broker/processor/PopReviveService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
index 93167db373..d5174d3d18 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
@@ -595,6 +595,7 @@ public class PopReviveService extends ServiceThread {
         newCk.setCId(oldCK.getCId());
         newCk.setTopic(oldCK.getTopic());
         newCk.setQueueId(oldCK.getQueueId());
+        newCk.setBrokerName(oldCK.getBrokerName());
         newCk.addDiff(0);
         MessageExtBrokerInner ckMsg = 
brokerController.getPopMessageProcessor().buildCkMsg(newCk, queueId);
         brokerController.getMessageStore().putMessage(ckMsg);