[rocketmq] branch develop updated: [ISSUE #7039] Fix retry message filter when subtype is TAG (#7040)

[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 d429bd72df [ISSUE #7039] Fix retry message filter when subtype is TAG 
(#7040)
d429bd72df is described below

commit d429bd72dfae0901f4325c8e9c6ce631286e40d4
Author: cnScarb <jjhfe...@163.com>
AuthorDate: Fri Jul 28 09:46:39 2023 +0800

    [ISSUE #7039] Fix retry message filter when subtype is TAG (#7040)
---
 .../rocketmq/broker/filter/ExpressionForRetryMessageFilter.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/filter/ExpressionForRetryMessageFilter.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/filter/ExpressionForRetryMessageFilter.java
index d2d1087ef8..bc01b21cb9 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/filter/ExpressionForRetryMessageFilter.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/filter/ExpressionForRetryMessageFilter.java
@@ -45,12 +45,12 @@ public class ExpressionForRetryMessageFilter extends 
ExpressionMessageFilter {
             return true;
         }
 
-        boolean isRetryTopic = 
subscriptionData.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX);
-
-        if (!isRetryTopic && 
ExpressionType.isTagType(subscriptionData.getExpressionType())) {
+        if (ExpressionType.isTagType(subscriptionData.getExpressionType())) {
             return true;
         }
 
+        boolean isRetryTopic = 
subscriptionData.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX);
+
         ConsumerFilterData realFilterData = this.consumerFilterData;
         Map<String, String> tempProperties = properties;
         boolean decoded = false;