[rocketmq] branch develop updated: [ISSUE #1901] Fix bug in sending request/reply message using broker 4.7.0

[di...@apache.org]

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

dinglei 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 276536e  [ISSUE #1901] Fix bug in sending request/reply message using broker 4.7.0
276536e is described below

commit 276536ed341a5b3f78479ba23b027ceb0b98cf8d
Author: rongtong <ji...@163.com>
AuthorDate: Fri Apr 3 15:49:58 2020 +0800

    [ISSUE #1901] Fix bug in sending request/reply message using broker 4.7.0
    
    fix(broker):fix bug sending request message using broker 4.7.0 (#1902)
---
 .../org/apache/rocketmq/broker/processor/SendMessageProcessor.java    | 4 ++++
 1 file changed, 4 insertions(+)

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
index 801d886..dac4c27 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
@@ -281,6 +281,10 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement
         msgInner.setBornHost(ctx.channel().remoteAddress());
         msgInner.setStoreHost(this.getStoreHost());
         msgInner.setReconsumeTimes(requestHeader.getReconsumeTimes() == null ? 0 : requestHeader.getReconsumeTimes());
+        String clusterName = this.brokerController.getBrokerConfig().getBrokerClusterName();
+        MessageAccessor.putProperty(msgInner, MessageConst.PROPERTY_CLUSTER, clusterName);
+        msgInner.setPropertiesString(MessageDecoder.messageProperties2String(msgInner.getProperties()));
+
         CompletableFuture<PutMessageResult> putMessageResult = null;
         Map<String, String> origProps = MessageDecoder.string2messageProperties(requestHeader.getProperties());
         String transFlag = origProps.get(MessageConst.PROPERTY_TRANSACTION_PREPARED);