[AMQ-8354] Fix NPE on removing consumers.

amazon-mq · Aug 8, 2024 · d4811b7 · d4811b7
1 parent d6dea41
commit d4811b7
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/replica/ReplicaJmxBroker.java b/activemq-broker/src/main/java/org/apache/activemq/replica/ReplicaJmxBroker.java
@@ -27,6 +27,7 @@
 import org.apache.activemq.broker.jmx.QueueView;
 import org.apache.activemq.broker.jmx.TopicView;
 import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.RegionBroker;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ConsumerInfo;
@@ -88,6 +89,21 @@ public Subscription addConsumer(ConnectionContext context, ConsumerInfo info) th
         return subscription;
     }
 
+    @Override
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
+        if (ReplicaSupport.isReplicationDestination(info.getDestination()) && brokerService.isUseJmx() &&
+                replicaPolicy.isHideReplicationDestination()) {
+            ManagedRegionBroker managedRegionBroker = (ManagedRegionBroker) getAdaptor(ManagedRegionBroker.class);
+            if (managedRegionBroker != null) {
+                // Bypassing ManagedRegionBroker to avoid failures in unregisterSubscription
+                managedRegionBroker.getRegion(info.getDestination()).removeConsumer(context, info);
+            }
+        } else {
+            super.removeConsumer(context, info);
+        }
+
+    }
+
     private void reregisterReplicationDestination(ActiveMQDestination replicationDestination, Destination destination) {
         try {
             if (!brokerService.isUseJmx()) {