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-6058 

Updating patch to make sure SelectorAwareVirtualTopics are covered
and code cleanup
This commit is contained in:
Christopher L. Shannon (cshannon) 2015-11-23 20:35:32 +00:00
parent bf36c4cb88
commit bc9edf00d1
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,21 +50,25 @@ public class SelectorAwareVirtualTopicInterceptor extends VirtualTopicIntercepto
*/
@Override
protected boolean shouldDispatch(final Broker broker, Message message, Destination dest) throws IOException {
boolean matches = false;
MessageEvaluationContext msgContext = new NonCachedMessageEvaluationContext();
msgContext.setDestination(dest.getActiveMQDestination());
msgContext.setMessageReference(message);
List<Subscription> subs = dest.getConsumers();
for (Subscription sub : subs) {
if (sub.matches(message, msgContext)) {
matches = true;
break;
//first validate that the prefix matches in the super class
if (super.shouldDispatch(broker, message, dest)) {
boolean matches = false;
MessageEvaluationContext msgContext = new NonCachedMessageEvaluationContext();
msgContext.setDestination(dest.getActiveMQDestination());
msgContext.setMessageReference(message);
List<Subscription> subs = dest.getConsumers();
for (Subscription sub : subs) {
if (sub.matches(message, msgContext)) {
matches = true;
break;
}
}
if (matches == false) {
matches = tryMatchingCachedSubs(broker, dest, msgContext);
}
return matches;
}
if (matches == false) {
matches = tryMatchingCachedSubs(broker, dest, msgContext);
}
return matches;
return false;
}
private boolean tryMatchingCachedSubs(final Broker broker, Destination dest, MessageEvaluationContext msgContext) {

7
activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/VirtualTopicInterceptor.java
View File

@ -142,11 +142,8 @@ public class VirtualTopicInterceptor extends DestinationFilter {
}
protected boolean shouldDispatch(Broker broker, Message message, Destination dest) throws IOException {
//can't find .* in the prefix, so default back to old logic and return true
if(prefix.indexOf(".*")>0){
return dest.getName().startsWith(prefix.substring(0,prefix.indexOf(".*")));
}
else return true;
//if can't find .* in the prefix, default back to old logic and return true
return prefix.contains(".*") ? dest.getName().startsWith(prefix.substring(0, prefix.indexOf(".*"))) : true;
}
protected ActiveMQDestination getQueueConsumersWildcard(ActiveMQDestination original) {