[activemq] branch activemq-5.17.x updated: [AMQ-8518] Avoid NPE if path is null (at startup)

[jbonofre]

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

jbonofre pushed a commit to branch activemq-5.17.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.17.x by this push:
     new 68bed90c9 [AMQ-8518] Avoid NPE if path is null (at startup)
68bed90c9 is described below

commit 68bed90c99c09bf96c8944b890022d8ff28ca969
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Mon Apr 18 16:52:46 2022 +0200

    [AMQ-8518] Avoid NPE if path is null (at startup)
    
    (cherry picked from commit 0849ae02116b9da3251b026546ce2fb049589dbe)
---
 .../src/main/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 8a9ea8567..e7628a849 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;