Fixed matching + containing topics

moquette-io · Aug 3, 2024 · c28290f · c28290f
1 parent b8c68c8
commit c28290f
Showing 1 changed file with 2 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
@@ -254,12 +254,12 @@ private List<Subscription> recursiveMatch(Topic topicName, INode inode, int dept
         // 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);
         if (subInode.isPresent()) {
-            subscriptions.addAll(recursiveMatch(remainingTopic, subInode.get(), depth + 1));
+            Topic remainingRealTopic = (ROOT.equals(cnode.getToken())) ? topicName : topicName.exceptFullHeadToken();
+            subscriptions.addAll(recursiveMatch(remainingRealTopic, subInode.get(), depth + 1));
         }
         if (remainingTopic.isEmpty()) {
             subscriptions.addAll(cnode.sharedAndNonSharedSubscriptions());