[activemq-artemis] branch master updated: ARTEMIS-2802: Add a null check when checking matching metaData inside Federated Queue

[jb...@apache.org]

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

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c4d7a7  ARTEMIS-2802: Add a null check when checking matching metaData inside Federated Queue
     new 457915f  This closes #3465
4c4d7a7 is described below

commit 4c4d7a71cbd665b75aab8bd33f4719220e4dea7d
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
AuthorDate: Tue Feb 23 10:24:13 2021 -0500

    ARTEMIS-2802: Add a null check when checking matching metaData inside
    Federated Queue
    
    Other protocols besides CORE may not have a metadata map so we need to
    check for null before passing to the filter matcher
---
 .../activemq/artemis/core/server/federation/queue/FederatedQueue.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java
index 33df3b5..7ce43a3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/queue/FederatedQueue.java
@@ -143,7 +143,8 @@ public class FederatedQueue extends FederatedAbstract implements ActiveMQServerC
       //We check the session meta data to see if its a federation session, if so by default we ignore these.
       //To not ignore these, set include-federated to true, which will mean no meta data filter.
       ServerSession serverSession = server.getSessionByID(consumer.getSessionID());
-      if (metaDataFilter != null && serverSession != null && metaDataFilter.match(serverSession.getMetaData())) {
+      if (metaDataFilter != null && serverSession != null && serverSession.getMetaData() != null &&
+          metaDataFilter.match(serverSession.getMetaData())) {
          return;
       }
       if (match(consumer)) {