From 22c91039553c1ef31c86a3fdfd437ff115e04320 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Mon, 16 Nov 2020 16:55:24 +0200
Subject: [PATCH] fix MqttTopicFilterFactory toFilter

---
 .../mqtt/util/MqttTopicFilterFactory.java       | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java
index f2b4ef27e2..0c3b497591 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java
@@ -33,16 +33,13 @@ public class MqttTopicFilterFactory {
             throw new IllegalArgumentException("Topic filter can't be empty!");
         }
         return filters.computeIfAbsent(topicFilter, filter -> {
-            if (filter.contains("+") || filter.contains("#")) {
-                String regex;
-                if (filter.equals("#")) {
-                    return new AlwaysTrueTopicFilter();
-                } else {
-                    regex = filter
-                            .replace("\\", "\\\\")
-                            .replace("+", "[^/]+")
-                            .replace("/#", "($|/.*)");
-                }
+            if (filter.equals("#")) {
+                return new AlwaysTrueTopicFilter();
+            } else if (filter.contains("+") || filter.contains("#")) {
+                String regex = filter
+                        .replace("\\", "\\\\")
+                        .replace("+", "[^/]+")
+                        .replace("/#", "($|/.*)");
                 log.debug("Converting [{}] to [{}]", filter, regex);
                 return new RegexTopicFilter(regex);
             } else {