[AMQ-9692] Support destination gc sweep of destinations with only wildcard consumers

mattrpav · mattrpav · commit e23f099fae08 · 2025-08-26T17:34:07.000-05:00
diff --git a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
@@ -278,7 +278,12 @@ public void addDestinationInfo(ConnectionContext context, DestinationInfo info)
 
     @Override
     public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
-        super.removeDestination(context, destination, timeout);
+        removeDestination(context, destination, timeout, false);
+    }
+
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
         DestinationInfo info = destinations.remove(destination);
         if (info != null) {
 
@@ -311,7 +316,7 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
             ActiveMQTopic[] advisoryDestinations = AdvisorySupport.getAllDestinationAdvisoryTopics(destination);
             for (ActiveMQTopic advisoryDestination : advisoryDestinations) {
                 try {
-                    next.removeDestination(context, advisoryDestination, -1);
+                    next.removeDestination(context, advisoryDestination, -1, withOnlyWildcardConsumers);
                 } catch (Exception expectedIfDestinationDidNotExistYet) {
                 }
             }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
@@ -191,6 +191,15 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         }
     }
 
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        next.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        Broker brokers[] = getListeners();
+        for (int i = 0; i < brokers.length; i++) {
+            brokers[i].removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        }
+    }
+
     @Override
     public void start() throws Exception {
         next.start();
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFilter.java
@@ -179,6 +179,11 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         getNext().removeDestination(context, destination, timeout);
     }
 
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        getNext().removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+    }
+
     @Override
     public ActiveMQDestination[] getDestinations() throws Exception {
         return getNext().getDestinations();
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java
@@ -153,6 +153,10 @@ public Destination addDestination(ConnectionContext context, ActiveMQDestination
     public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
     }
 
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+    }
+
     @Override
     public Subscription addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         return null;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/ErrorBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/ErrorBroker.java
@@ -171,6 +171,11 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         throw new BrokerStoppedException(this.message);
     }
 
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        throw new BrokerStoppedException(this.message);
+    }
+
     @Override
     public Subscription addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         throw new BrokerStoppedException(this.message);
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
@@ -62,4 +62,9 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         super.removeDestination(context, destination, timeout);
         regionBroker.unregister(destination);
     }
+
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        regionBroker.unregister(destination);
+    }
 }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
@@ -63,4 +63,9 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         regionBroker.unregister(destination);
     }
 
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        regionBroker.unregister(destination);
+    }
+
 }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
@@ -63,4 +63,8 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         regionBroker.unregister(destination);
     }
 
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        regionBroker.unregister(destination);
+    }
 }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
@@ -63,4 +63,8 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         regionBroker.unregister(destination);
     }
 
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        regionBroker.unregister(destination);
+    }
 }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
@@ -260,16 +260,24 @@ protected List<Subscription> addSubscriptionsForDestination(ConnectionContext co
     }
 
     @Override
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout)
-            throws Exception {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
+        removeDestination(context, destination, timeout, false);
+    }
+
+    @Override
+    public void removeDestination(final ConnectionContext context, final ActiveMQDestination destination, final long timeout, final boolean withOnlyWildcardConsumers) throws Exception {
 
         // No timeout.. then try to shut down right way, fails if there are
         // current subscribers.
         if (timeout == 0) {
             for (Iterator<Subscription> iter = subscriptions.values().iterator(); iter.hasNext();) {
                 Subscription sub = iter.next();
                 if (sub.matches(destination) ) {
-                    throw new JMSException("Destination: " + destination + " still has an active subscription: " + sub);
+                    if(withOnlyWildcardConsumers && sub.isWildcard()) {
+                        continue;
+                    } else {
+                        throw new JMSException("Destination: " + destination + " still has an active subscription: " + sub);
+                    }
                 }
             }
         }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
@@ -105,7 +105,8 @@ public abstract class BaseDestination implements Destination {
     private long inactiveTimeoutBeforeGC = DEFAULT_INACTIVE_TIMEOUT_BEFORE_GC;
     private boolean gcIfInactive;
     private boolean gcWithNetworkConsumers;
-    private long lastActiveTime=0l;
+    private boolean gcWithOnlyWildcardConsumers;
+    private long lastActiveTime = 0L;
     private boolean reduceMemoryFootprint = false;
     protected final Scheduler scheduler;
     private boolean disposed = false;
@@ -311,12 +312,24 @@ public final MessageStore getMessageStore() {
 
     @Override
     public boolean isActive() {
-        boolean isActive = destinationStatistics.getConsumers().getCount() > 0 ||
-                           destinationStatistics.getProducers().getCount() > 0;
-        if (isActive && isGcWithNetworkConsumers() && destinationStatistics.getConsumers().getCount() > 0) {
-            isActive = hasRegularConsumers(getConsumers());
+        if (destinationStatistics.getProducers().getCount() > 0) {
+            return true;
         }
-        return isActive;
+
+        var destinationActive = true;
+        if (destinationStatistics.getConsumers().getCount() > 0) {
+            if (isGcWithNetworkConsumers()) {
+                destinationActive = hasRegularConsumers(getConsumers());
+            }
+
+            if (destinationActive &&
+                isGcWithOnlyWildcardConsumers()) {
+                destinationActive = !getConsumers().stream().allMatch(Subscription::isWildcard);
+            }
+        } else {
+            destinationActive = false;
+        }
+        return destinationActive;
     }
 
     @Override
@@ -824,19 +837,37 @@ public boolean isGcWithNetworkConsumers() {
         return gcWithNetworkConsumers;
     }
 
+    /**
+     * Indicate if it is ok to gc destinations that have only wildcard consumers
+     * @param gcWithOnlyWildcardConsumers
+     */
+    public void setGcWithOnlyWildcardConsumers(boolean gcWithOnlyWildcardConsumers) {
+        this.gcWithOnlyWildcardConsumers = gcWithOnlyWildcardConsumers;
+    }
+
+    public boolean isGcWithOnlyWildcardConsumers() {
+        return gcWithOnlyWildcardConsumers;
+    }
+
     @Override
     public void markForGC(long timeStamp) {
-        if (isGcIfInactive() && this.lastActiveTime == 0 && isActive() == false
-                && destinationStatistics.getMessages().getCount() == 0 && getInactiveTimeoutBeforeGC() > 0l) {
+        if (isGcIfInactive()
+            && this.lastActiveTime == 0
+            && destinationStatistics.getMessages().getCount() == 0
+            && getInactiveTimeoutBeforeGC() > 0L
+            && !isActive()) {
             this.lastActiveTime = timeStamp;
         }
     }
 
     @Override
     public boolean canGC() {
-        boolean result = false;
-        final long currentLastActiveTime = this.lastActiveTime;
-        if (isGcIfInactive() && currentLastActiveTime != 0l && destinationStatistics.getMessages().getCount() == 0L ) {
+        var result = false;
+        final var currentLastActiveTime = this.lastActiveTime;
+        if (isGcIfInactive()
+            && currentLastActiveTime != 0L
+            && destinationStatistics.getMessages().getCount() == 0L
+            && !isActive()) {
             if ((System.currentTimeMillis() - currentLastActiveTime) >= getInactiveTimeoutBeforeGC()) {
                 result = true;
             }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Destination.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Destination.java
@@ -267,4 +267,5 @@ public interface Destination extends Service, Task, Message.MessageDestination {
 
     void setAdvancedMessageStatisticsEnabled(boolean advancedMessageStatisticsEnabled);
 
+    boolean isGcWithOnlyWildcardConsumers();
 }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/DestinationFilter.java
@@ -429,6 +429,11 @@ public void setAdvancedMessageStatisticsEnabled(boolean advancedMessageStatistic
         next.setAdvancedMessageStatisticsEnabled(advancedMessageStatisticsEnabled);
     }
 
+    @Override
+    public boolean isGcWithOnlyWildcardConsumers() {
+        return next.isGcWithOnlyWildcardConsumers();
+    }
+
     public void deleteSubscription(ConnectionContext context, SubscriptionKey key) throws Exception {
         if (next instanceof DestinationFilter) {
             DestinationFilter filter = (DestinationFilter) next;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Region.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Region.java
@@ -66,6 +66,19 @@ public interface Region extends Service {
      */
     void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception;
 
+    /**
+     * Used to destroy a destination.
+     * This should try to quiesce use of the destination up to the timeout allotted time before removing the destination.
+     * This will remove all persistent messages associated with the destination.
+     *
+     * @param context the environment the operation is being executed under.
+     * @param destination what is being removed from the broker.
+     * @param timeout the max amount of time to wait for the destination to quiesce
+     * @param withOnlyWildcardConsumers allow removing if all active subscriptions are wildcard
+     * @throws Exception TODO
+     */
+    void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception;
+
     /**
      * Returns a reference to the concurrent hash map that holds known destinations, do not modify
      */
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
@@ -367,9 +367,9 @@ public Destination addDestination(ConnectionContext context, ActiveMQDestination
     }
 
     @Override
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
         if (destinations.containsKey(destination)) {
-            getRegion(destination).removeDestination(context, destination, timeout);
+            getRegion(destination).removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
             destinations.remove(destination);
         }
     }
@@ -914,7 +914,7 @@ protected void purgeInactiveDestinations() {
                     }
                     log.info("{} Inactive for longer than {} ms - removing ...", dest.getName(), dest.getInactiveTimeoutBeforeGC());
                     try {
-                        getRoot().removeDestination(context, dest.getActiveMQDestination(), isAllowTempAutoCreationOnSend() ? 1 : 0);
+                        getRoot().removeDestination(context, dest.getActiveMQDestination(), isAllowTempAutoCreationOnSend() ? 1 : 0, dest.isGcWithOnlyWildcardConsumers());
                     } catch (Throwable e) {
                         LOG.error("Failed to remove inactive destination {}", dest, e);
                     }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueue.java
@@ -33,7 +33,7 @@
  * 
  * 
  */
-public class TempQueue extends Queue{
+public class TempQueue extends Queue {
     private static final Logger LOG = LoggerFactory.getLogger(TempQueue.class);
     private final ActiveMQTempDestination tempDest;
    
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
@@ -48,6 +48,10 @@ public String toString() {
     }
 
     public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
+        removeDestination(context, destination, timeout, false);
+    }
+
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
 
         // Force a timeout value so that we don't get an error that
         // there is still an active sub. Temp destination may be removed
@@ -56,9 +60,9 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
             timeout = 1;
         }
 
-        super.removeDestination(context, destination, timeout);
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
     }
-    
+
     /*
      * For a Queue, dispatch order is imperative to match acks, so the dispatch is deferred till 
      * the notification to ensure that the subscription chosen by the master is used.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
@@ -68,6 +68,10 @@ public String toString() {
     }
 
     public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
+        removeDestination(context, destination, timeout, false);
+    }
+
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
 
         // Force a timeout value so that we don't get an error that
         // there is still an active sub. Temp destination may be removed
@@ -76,7 +80,7 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
             timeout = 1;
         }
 
-        super.removeDestination(context, destination, timeout);
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
     }
 
 }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
@@ -99,6 +99,7 @@ public class PolicyEntry extends DestinationMapEntry {
     private boolean prioritizedMessages;
     private boolean allConsumersExclusiveByDefault;
     private boolean gcInactiveDestinations;
+    private boolean gcWithOnlyWildcardConsumers;
     private boolean gcWithNetworkConsumers;
     private long inactiveTimeoutBeforeGC = BaseDestination.DEFAULT_INACTIVE_TIMEOUT_BEFORE_GC;
     private boolean reduceMemoryFootprint;
@@ -263,6 +264,9 @@ public void baseUpdate(BaseDestination destination, Set<String> includedProperti
         if (isUpdate("gcInactiveDestinations", includedProperties)) {
             destination.setGcIfInactive(isGcInactiveDestinations());
         }
+        if (isUpdate("gcWithOnlyWildcardConsumers", includedProperties)) {
+            destination.setGcWithOnlyWildcardConsumers(isGcWithOnlyWildcardConsumers());
+        }
         if (isUpdate("gcWithNetworkConsumers", includedProperties)) {
             destination.setGcWithNetworkConsumers(isGcWithNetworkConsumers());
         }
@@ -1082,6 +1086,14 @@ public void setInactiveTimeoutBeforeGC(long inactiveTimeoutBeforeGC) {
         this.inactiveTimeoutBeforeGC = inactiveTimeoutBeforeGC;
     }
 
+    public void setGcWithOnlyWildcardConsumers(boolean gcWithOnlyWildcardConsumers) {
+        this.gcWithOnlyWildcardConsumers = gcWithOnlyWildcardConsumers;
+    }
+
+    public boolean isGcWithOnlyWildcardConsumers() {
+        return gcWithOnlyWildcardConsumers;
+    }
+
     public void setGcWithNetworkConsumers(boolean gcWithNetworkConsumers) {
         this.gcWithNetworkConsumers = gcWithNetworkConsumers;
     }
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java
@@ -104,6 +104,11 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         super.removeDestination(context, convertDestination(destination), timeout);
     }
 
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, convertDestination(destination), timeout, withOnlyWildcardConsumers);
+    }
+
     @Override
     public void addDestinationInfo(ConnectionContext context, DestinationInfo info) throws Exception {
         info.setDestination(convertDestination(info.getDestination()));
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/util/DestinationsPlugin.java b/activemq-broker/src/main/java/org/apache/activemq/broker/util/DestinationsPlugin.java
@@ -53,6 +53,12 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des
         destinations.remove(destination);
     }
 
+    @Override
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {
+        super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);
+        destinations.remove(destination);
+    }
+
     @Override
     public void start() throws Exception {
         super.start();
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/view/DestinationDotFileInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/view/DestinationDotFileInterceptor.java
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AbstractAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/AbstractAuthenticationBroker.java
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasDualAuthenticationBroker.java
diff --git a/activemq-runtime-config/src/test/java/org/apache/activemq/java/JavaPolicyEntryTest.java b/activemq-runtime-config/src/test/java/org/apache/activemq/java/JavaPolicyEntryTest.java
diff --git a/activemq-shiro/src/main/java/org/apache/activemq/shiro/authz/AuthorizationFilter.java b/activemq-shiro/src/main/java/org/apache/activemq/shiro/authz/AuthorizationFilter.java
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/DestinationGCTest.java

Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,9 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des`
`62`	`62`	`super.removeDestination(context, destination, timeout);`
`63`	`63`	`regionBroker.unregister(destination);`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {`
	`67`	`+ super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);`
	`68`	`+ regionBroker.unregister(destination);`
	`69`	`+ }`
`65`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,9 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des`
`63`	`63`	`regionBroker.unregister(destination);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {`
	`67`	`+ super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);`
	`68`	`+ regionBroker.unregister(destination);`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,8 @@ public void removeDestination(ConnectionContext context, ActiveMQDestination des`
`63`	`63`	`regionBroker.unregister(destination);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout, boolean withOnlyWildcardConsumers) throws Exception {`
	`67`	`+ super.removeDestination(context, destination, timeout, withOnlyWildcardConsumers);`
	`68`	`+ regionBroker.unregister(destination);`
	`69`	`+ }`
`66`	`70`	`}`