From 0fad7ece876a8afbf419b8fb4a7c6de8878d1141 Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Thu, 4 Apr 2024 14:51:10 -0500
Subject: [PATCH] ARTEMIS-4714 mitigate NPE in FederatedQueueConsumerImpl
 MessageListener

---
 .../core/server/federation/FederatedQueueConsumerImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
index e8cb99b413..2b854d9c5a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
@@ -325,7 +325,10 @@ public class FederatedQueueConsumerImpl implements FederatedQueueConsumer, Sessi
       } catch (Exception e) {
          ActiveMQServerLogger.LOGGER.federationDispatchError(clientMessage.toString(), e);
          try {
-            clientSession.rollback();
+            ClientSession localSession = clientSession;
+            if (localSession != null) {
+               localSession.rollback();
+            }
          } catch (ActiveMQException e1) {
          }
       }