From 86a069ac5db9742ae58e396e162a0b3e2bdc66c3 Mon Sep 17 00:00:00 2001
From: Dany LECOQ <dany.lecoq@vif.fr>
Date: Sun, 29 Sep 2019 16:18:24 +0200
Subject: [PATCH] AMQ-7312 virtualSelectorCacheBrokerPlugin addConsumer issue

---
 .../apache/activemq/plugin/SubQueueSelectorCacheBroker.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
index 2d31b6e67b..bc55eac4cb 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
@@ -131,8 +131,10 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
 
     @Override
     public Subscription addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
-        // don't track selectors for advisory topics or temp destinations
-        if (!AdvisorySupport.isAdvisoryTopic(info.getDestination()) && !info.getDestination().isTemporary()) {
+		// don't track selectors for advisory topics, temp destinations or console
+		// related consumers
+		if (!AdvisorySupport.isAdvisoryTopic(info.getDestination()) && !info.getDestination().isTemporary()
+				&& !info.isBrowser()) {
             String destinationName = info.getDestination().getQualifiedName();
             LOG.debug("Caching consumer selector [{}] on  '{}'", info.getSelector(), destinationName);