From 0849ae02116b9da3251b026546ce2fb049589dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Mon, 18 Apr 2022 16:52:46 +0200
Subject: [PATCH] [AMQ-8518] Avoid NPE if path is null (at startup)

---
 .../java/org/apache/activemq/filter/DestinationMapNode.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
index 8a9ea8567f..e7628a849e 100644
--- a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
+++ b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
@@ -235,7 +235,7 @@ public class DestinationMapNode implements DestinationNode {
         int size = paths.length;
         for (int i = startIndex; i < size && node != null; i++) {
             String path = paths[i];
-            if (deep && path.equals(ANY_DESCENDENT)) {
+            if (deep && path != null && path.equals(ANY_DESCENDENT)) {
                 answer.addAll(node.getDesendentValues());
                 couldMatchAny = false;
                 break;