[rocketmq] branch develop updated: [ROCKETMQ-351] Add a default value to expressionType and polish the judgement. (#214)

[yu...@apache.org]

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

yukon 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 a096580  [ROCKETMQ-351] Add a default value to expressionType and polish the judgement. (#214)
a096580 is described below

commit a096580f3152e12fc9f9876c9e9721eb0109a90a
Author: Eric Liu <li...@gmail.com>
AuthorDate: Tue Jan 23 14:12:33 2018 +0800

    [ROCKETMQ-351] Add a default value to expressionType and polish the judgement. (#214)
---
 .../main/java/org/apache/rocketmq/common/filter/ExpressionType.java   | 2 +-
 .../apache/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 3b7940a..bc37733 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 e456b7e..83e254f 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;

-- 
To stop receiving notification emails like this one, please contact
yukon@apache.org.