[activemq-artemis] branch main updated: ARTEMIS-3872 fix NPE

[jbertram]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new f88381430c ARTEMIS-3872 fix NPE
f88381430c is described below

commit f88381430c99fa6bb3b9859bc17b5d8ac2e39fbc
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Thu Aug 25 15:15:59 2022 -0500

    ARTEMIS-3872 fix NPE
---
 .../java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index e64990642c..56a8ecc2c6 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2184,7 +2184,7 @@ public class QueueImpl extends CriticalComponentImpl 
implements Queue {
                   txCount = 0;
                }
 
-               List<MessageReference> cancelled = 
scheduledDeliveryHandler.cancel(ref -> filter1.match(ref.getMessage()));
+               List<MessageReference> cancelled = 
scheduledDeliveryHandler.cancel(ref -> filter1 == null ? true : 
filter1.match(ref.getMessage()));
                for (MessageReference messageReference : cancelled) {
                   messageAction.actMessage(tx, messageReference);
                   count++;