[rocketmq] branch develop updated: [ISSUE #5104] Clean property PROPERTY_TIMER_DELAY_MS if not timer message #

[jinrongtong]

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

jinrongtong 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 54d6580f6 [ISSUE #5104] Clean property PROPERTY_TIMER_DELAY_MS if not 
timer message #
54d6580f6 is described below

commit 54d6580f68d86a3b13854732eaca4110f87ec4eb
Author: Oliver <wqdyx...@163.com>
AuthorDate: Mon Sep 19 10:01:09 2022 +0800

    [ISSUE #5104] Clean property PROPERTY_TIMER_DELAY_MS if not timer message #
---
 broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java 
b/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
index 78a1ee2cd..f8a5f6789 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/util/HookUtils.java
@@ -155,6 +155,9 @@ public class HookUtils {
             if (null != 
msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_SEC)) {
                 MessageAccessor.clearProperty(msg, 
MessageConst.PROPERTY_TIMER_DELAY_SEC);
             }
+            if (null != msg.getProperty(MessageConst.PROPERTY_TIMER_DELAY_MS)) 
{
+                MessageAccessor.clearProperty(msg, 
MessageConst.PROPERTY_TIMER_DELAY_MS);
+            }
             return false;
             //return 
this.defaultMessageStore.getMessageStoreConfig().isTimerInterceptDelayLevel();
         }