From a096580f3152e12fc9f9876c9e9721eb0109a90a Mon Sep 17 00:00:00 2001
From: Eric Liu <liuxuedee@gmail.com>
Date: Tue, 23 Jan 2018 14:12:33 +0800
Subject: [PATCH] [ROCKETMQ-351] Add a default value to expressionType and
 polish the judgement. (#214)

---
 .../org/apache/rocketmq/common/filter/ExpressionType.java     | 2 +-
 .../rocketmq/common/protocol/heartbeat/SubscriptionData.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 3b7940ab..bc37733e 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 e456b7e6..83e254f2 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<SubscriptionData> {
     private Set<String> tagsSet = new HashSet<String>();
     private Set<Integer> codeSet = new HashSet<Integer>();
     private long subVersion = System.currentTimeMillis();
-    private String expressionType;
+    private String expressionType = ExpressionType.TAG;
 
     @JSONField(serialize = false)
     private String filterClassSource;
-- 
GitLab