Repository: activemq Updated Branches: refs/heads/activemq-5.15.x 3c2d5a301 -> 6e7f62245
AMQ-6901 - Add NPE check inside DestinationMap filter (cherry picked from commit 703b7b151017fe117363e5598146e157bad78265) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6e7f6224 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6e7f6224 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6e7f6224 Branch: refs/heads/activemq-5.15.x Commit: 6e7f6224562f3c990b44812aed050c972d0a53df Parents: 3c2d5a3 Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Fri Feb 16 14:32:24 2018 -0500 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Fri Feb 16 14:33:27 2018 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/filter/DestinationMap.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/6e7f6224/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java ---------------------------------------------------------------------- diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java index 208ed67..624b10f 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java @@ -231,6 +231,10 @@ public class DestinationMap { @SuppressWarnings("rawtypes") //Used to filter out any child/unmatching entries private boolean isMatchOrParent(final ActiveMQDestination destination, final DestinationMapEntry entry) { + //If destination not set then do not filter out + if (entry.getDestination() == null) { + return true; + } final DestinationFilter filter = DestinationFilter.parseFilter(entry.getDestination()); return destination.equals(entry.getDestination()) || filter.matches(destination); }
