From 0027a1486d4f2d6f7dce3010751167e883783945 Mon Sep 17 00:00:00 2001
From: redlsz <szliu0927@gmail.com>
Date: Mon, 9 Oct 2023 16:52:10 +0800
Subject: [PATCH] [ISSUE #7412] Fix pop revive message error when reput
 checkpoint

---
 .../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 93167db373a..d5174d3d186 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 @@ private void rePutCK(PopCheckPoint oldCK, Pair<Long, Boolean> pair) {
         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);