Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6210 

Clean up and apply filtering for temp destinations to removeConsumer as
well.  

This closes #175
This commit is contained in:
Timothy Bish 2016-03-28 14:40:00 -04:00
parent f3ecc293f0
commit 48ba714b30
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
View File

@ -171,8 +171,7 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
@Override
public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
if (!AdvisorySupport.isAdvisoryTopic(info.getDestination())) {
if (!AdvisorySupport.isAdvisoryTopic(info.getDestination()) && !info.getDestination().isTemporary()) {
if (singleSelectorPerDestination) {
String destinationName = info.getDestination().getQualifiedName();
Set<String> selectors = subSelectorCache.get(destinationName);
@ -190,8 +189,7 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
private void readCache() {
if (persistFile != null && persistFile.exists()) {
try {
FileInputStream fis = new FileInputStream(persistFile);
try {
try (FileInputStream fis = new FileInputStream(persistFile);) {
ObjectInputStream in = new ObjectInputStream(fis);
try {
subSelectorCache = (ConcurrentHashMap<String, Set<String>>) in.readObject();
@ -200,8 +198,6 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
} finally {
in.close();
}
} finally {
fis.close();
}
} catch (IOException ex) {
LOG.error("Unable to read persisted selector cache...it will be ignored!", ex);
@ -347,9 +343,10 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
Matcher matcher = LIKE_PATTERN.matcher(selector);
while(hasLikeOperator(matcher)) {
if (hasWildcardInCurrentMatch(matcher))
if (hasWildcardInCurrentMatch(matcher)) {
return true;
}
}
return false;
}
}