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

[AMQ-8012] Fix for ConcurrentModificationException in SubQueueSelectorCacheBroker 

- Remove non-thread-safe method getSelectors()
 - Update all references to use the thread-safe getSelectorsForDestination() method
This commit is contained in:
Matt Pavlovich 2020-07-24 12:22:12 -05:00
parent 6c07033c58
commit 083acb9691
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
View File

@ -77,7 +77,7 @@ public class SelectorAwareVirtualTopicInterceptor extends VirtualTopicIntercepto
LOG.debug("No active consumer match found. Will try cache if configured..."); LOG.debug("No active consumer match found. Will try cache if configured...");
if (selectorCachePlugin != null) { if (selectorCachePlugin != null) {
final Set<String> selectors = selectorCachePlugin.getSelector(dest.getActiveMQDestination().getQualifiedName()); final Set<String> selectors = selectorCachePlugin.getSelectorsForDestination(dest.getActiveMQDestination().getQualifiedName());
if (selectors != null) { if (selectors != null) {
for (String selector : selectors) { for (String selector : selectors) {
try { try {

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

@ -248,13 +248,6 @@ public class SubQueueSelectorCacheBroker extends BrokerFilter implements Runnabl
} }
} }
/**
* @return The JMS selector for the specified {@code destination}
*/
public Set<String> getSelector(final String destination) {
return subSelectorCache.get(destination);
}
/** /**
* Persist the selector cache every {@code MAX_PERSIST_INTERVAL}ms. * Persist the selector cache every {@code MAX_PERSIST_INTERVAL}ms.
* *