[rocketmq] branch develop updated: [ISSUE #4050] fix origin messsage id missing from dead leetter meessage

[zhangyang]

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

zhangyang 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 45010d9  [ISSUE #4050] fix origin messsage id missing from dead 
leetter meessage
45010d9 is described below

commit 45010d9bdf471d0ffa4e91c05022396ed283bad2
Author: zhangyang21 <zhangyan...@xiaomi.com>
AuthorDate: Tue Mar 29 13:44:49 2022 +0800

    [ISSUE #4050] fix origin messsage id missing from dead leetter meessage
    
    Signed-off-by: zhangyang21 <zhangyan...@xiaomi.com>
---
 .../rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
index cc3aee4..1ae4161 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
@@ -378,10 +378,10 @@ public class ConsumeMessageOrderlyService implements 
ConsumeMessageService {
         try {
             // max reconsume times exceeded then send to dead letter queue.
             Message newMsg = new 
Message(MixAll.getRetryTopic(this.defaultMQPushConsumer.getConsumerGroup()), 
msg.getBody());
+            MessageAccessor.setProperties(newMsg, msg.getProperties());
             String originMsgId = MessageAccessor.getOriginMessageId(msg);
             MessageAccessor.setOriginMessageId(newMsg, 
UtilAll.isBlank(originMsgId) ? msg.getMsgId() : originMsgId);
             newMsg.setFlag(msg.getFlag());
-            MessageAccessor.setProperties(newMsg, msg.getProperties());
             MessageAccessor.putProperty(newMsg, 
MessageConst.PROPERTY_RETRY_TOPIC, msg.getTopic());
             MessageAccessor.setReconsumeTime(newMsg, 
String.valueOf(msg.getReconsumeTimes()));
             MessageAccessor.setMaxReconsumeTimes(newMsg, 
String.valueOf(getMaxReconsumeTimes()));