[activemq] branch activemq-5.15.x updated: AMQ-7312 virtualSelectorCacheBrokerPlugin addConsumer issue

[jbonofre]

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

jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new 1d8ae31  AMQ-7312 virtualSelectorCacheBrokerPlugin addConsumer issue
1d8ae31 is described below

commit 1d8ae314bd8a18ed6ed3c0dea0ced08cadb6d1b8
Author: Dany LECOQ <dany.le...@vif.fr>
AuthorDate: Sun Sep 29 16:18:24 2019 +0200

    AMQ-7312 virtualSelectorCacheBrokerPlugin addConsumer issue
    
    (cherry picked from commit 86a069ac5db9742ae58e396e162a0b3e2bdc66c3)
---
 .../org/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 2d31b6e..bc55eac 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);