[rocketmq-spring] branch master updated: [ISSUE #294] GetAndWrapmessage method in rocketmqUtil is missing prefix when getting keys

[ji...@apache.org]

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

jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git


The following commit(s) were added to refs/heads/master by this push:
     new ba300d1  [ISSUE #294] GetAndWrapmessage method in rocketmqUtil is missing prefix when getting keys
ba300d1 is described below

commit ba300d1f74b003e25e53b6c00178164dd8abfc56
Author: jun.chen <33...@users.noreply.github.com>
AuthorDate: Thu Sep 17 14:06:00 2020 +0800

    [ISSUE #294] GetAndWrapmessage method in rocketmqUtil is missing prefix when getting keys
---
 .../main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java
index 311e5e5..7d25acd 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java
@@ -170,6 +170,10 @@ public class RocketMQUtil {
         Message rocketMsg = new Message(topic, tags, payloads);
         if (Objects.nonNull(headers) && !headers.isEmpty()) {
             Object keys = headers.get(RocketMQHeaders.KEYS);
+            // if headers not have 'KEYS', try add prefix when getting keys
+            if (StringUtils.isEmpty(keys)) {
+                keys = headers.get(toRocketHeaderKey(RocketMQHeaders.KEYS));
+            }
             if (!StringUtils.isEmpty(keys)) { // if headers has 'KEYS', set rocketMQ message key
                 rocketMsg.setKeys(keys.toString());
             }