Fixed matching + and # containing topics

moquette-io · Aug 3, 2024 · 808b32d · 808b32d
1 parent b8c68c8
commit 808b32d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/broker/src/main/java/io/moquette/broker/subscriptions/CTrie.java b/broker/src/main/java/io/moquette/broker/subscriptions/CTrie.java
@@ -247,14 +247,21 @@ private List<Subscription> recursiveMatch(Topic topicName, INode inode, int dept
         if (action == NavigationAction.STOP) {
             return Collections.emptyList();
         }
-        Topic remainingTopic = (ROOT.equals(cnode.getToken())) ? topicName : topicName.exceptHeadToken();
+        final boolean isRoot = ROOT.equals(cnode.getToken());
+        final boolean isSingle = Token.SINGLE.equals(cnode.getToken());
+        final boolean isMulti = Token.MULTI.equals(cnode.getToken());
+
+        Topic remainingTopic = isRoot
+            ? topicName
+            : (isSingle || isMulti)
+                ? topicName.exceptFullHeadToken()
+                : topicName.exceptHeadToken();
         List<Subscription> subscriptions = new ArrayList<>();
 
         // We should only consider the maximum three children children of
         // type #, + or exact match
         Optional<INode> subInode = cnode.childOf(Token.MULTI);
         if (subInode.isPresent()) {
-            Topic remainingRealTopic = (ROOT.equals(cnode.getToken())) ? topicName : topicName.exceptFullHeadToken();
             subscriptions.addAll(recursiveMatch(remainingTopic, subInode.get(), depth + 1));
         }
         subInode = cnode.childOf(Token.SINGLE);