diff --git a/common/src/main/java/org/apache/rocketmq/common/filter/ExpressionType.java b/common/src/main/java/org/apache/rocketmq/common/filter/ExpressionType.java index 3b7940abc7e..bc37733ed8c 100644 --- a/common/src/main/java/org/apache/rocketmq/common/filter/ExpressionType.java +++ b/common/src/main/java/org/apache/rocketmq/common/filter/ExpressionType.java @@ -59,7 +59,7 @@ public class ExpressionType { public static final String TAG = "TAG"; public static boolean isTagType(String type) { - if (type == null || TAG.equals(type)) { + if (type == null || "".equals(type) || TAG.equals(type)) { return true; } return false; diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/SubscriptionData.java b/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/SubscriptionData.java index e456b7e606a..83e254f22ed 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/SubscriptionData.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/SubscriptionData.java @@ -21,6 +21,8 @@ package org.apache.rocketmq.common.protocol.heartbeat; import com.alibaba.fastjson.annotation.JSONField; +import org.apache.rocketmq.common.filter.ExpressionType; + import java.util.HashSet; import java.util.Set; @@ -32,7 +34,7 @@ public class SubscriptionData implements Comparable { private Set tagsSet = new HashSet(); private Set codeSet = new HashSet(); private long subVersion = System.currentTimeMillis(); - private String expressionType; + private String expressionType = ExpressionType.TAG; @JSONField(serialize = false) private String filterClassSource;