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

Fix for https://issues.apache.org/jira/browse/AMQ-4884

This commit is contained in:
rajdavies 2013-11-13 18:50:24 +00:00
parent 2a6aab40b4
commit 7f639a6047
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java
View File

@ -20,14 +20,11 @@ package org.apache.activemq.filter;
import java.io.IOException;
import javax.jms.JMSException;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.util.JMSExceptionSupport;
/**
* Represents a filter which only operates on Destinations
*
*
*/
public abstract class DestinationFilter implements BooleanExpression {
@ -56,6 +53,7 @@ public abstract class DestinationFilter implements BooleanExpression {
return new CompositeDestinationFilter(destination);
}
String[] paths = DestinationPath.getDestinationPaths(destination);
paths = rationalizePaths(paths);
int idx = paths.length - 1;
if (idx >= 0) {
String lastPath = paths[idx];
@ -74,4 +72,27 @@ public abstract class DestinationFilter implements BooleanExpression {
// if none of the paths contain a wildcard then use equality
return new SimpleDestinationFilter(destination);
}
/**
* Look for the case where any CHILD is followed by any decsendant
*/
public static String[] rationalizePaths(String[] paths) {
String[] result = paths;
if (paths != null && paths.length > 1) {
int last = paths.length - 1;
if (paths[last].equals(ANY_DESCENDENT)) {
last -= 1;
if (paths[last].equals(ANY_DESCENDENT) || paths[last].equals(ANY_CHILD)) {
result = new String[paths.length-1];
System.arraycopy(paths,0,result,0,result.length);
result[result.length-1] = ANY_DESCENDENT;
result = rationalizePaths(result);
}
}
}
return result;
}
}

32
activemq-client/src/main/java/org/apache/activemq/filter/DestinationMap.java
View File

@ -35,8 +35,6 @@ import org.apache.activemq.command.ActiveMQDestination;
* pretty fast. <br>
* Looking up of a value could return a single value or a List of matching
* values if a wildcard or composite destination is used.
*
*
*/
public class DestinationMap {
protected static final String ANY_DESCENDENT = DestinationFilter.ANY_DESCENDENT;
@ -57,7 +55,7 @@ public class DestinationMap {
* @return a List of matching values or an empty list if there are no
* matching values.
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({"rawtypes", "unchecked"})
public synchronized Set get(ActiveMQDestination key) {
if (key.isComposite()) {
ActiveMQDestination[] destinations = key.getCompositeDestinations();
@ -66,7 +64,7 @@ public class DestinationMap {
ActiveMQDestination childDestination = destinations[i];
Object value = get(childDestination);
if (value instanceof Set) {
answer.addAll((Set)value);
answer.addAll((Set) value);
} else if (value != null) {
answer.add(value);
}
@ -86,9 +84,11 @@ public class DestinationMap {
return;
}
String[] paths = key.getDestinationPaths();
paths = DestinationFilter.rationalizePaths(paths);
getRootNode(key).add(paths, 0, value);
}
/**
* Removes the value from the associated destination
*/
@ -137,12 +137,12 @@ public class DestinationMap {
* A helper method to allow the destination map to be populated from a
* dependency injection framework such as Spring
*/
@SuppressWarnings({ "rawtypes" })
protected void setEntries(List<DestinationMapEntry> entries) {
@SuppressWarnings({"rawtypes"})
protected void setEntries(List<DestinationMapEntry> entries) {
for (Object element : entries) {
Class<? extends DestinationMapEntry> type = getEntryClass();
if (type.isInstance(element)) {
DestinationMapEntry entry = (DestinationMapEntry)element;
DestinationMapEntry entry = (DestinationMapEntry) element;
put(entry.getDestination(), entry.getValue());
} else {
throw new IllegalArgumentException("Each entry must be an instance of type: " + type.getName() + " but was: " + element);
@ -156,12 +156,12 @@ public class DestinationMap {
* restrict the type of allowed entries to make a type safe destination map
* for custom policies.
*/
@SuppressWarnings({ "rawtypes" })
@SuppressWarnings({"rawtypes"})
protected Class<? extends DestinationMapEntry> getEntryClass() {
return DestinationMapEntry.class;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({"rawtypes", "unchecked"})
protected Set findWildcardMatches(ActiveMQDestination key) {
String[] paths = key.getDestinationPaths();
Set answer = new HashSet();
@ -173,7 +173,7 @@ public class DestinationMap {
* @param key
* @return
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({"rawtypes", "unchecked"})
public Set removeAll(ActiveMQDestination key) {
Set rc = new HashSet();
if (key.isComposite()) {
@ -196,7 +196,7 @@ public class DestinationMap {
* @param destination the destination to find the value for
* @return the largest matching value or null if no value matches
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({"rawtypes", "unchecked"})
public Object chooseValue(ActiveMQDestination destination) {
Set set = get(destination);
if (set == null || set.isEmpty()) {
@ -210,7 +210,7 @@ public class DestinationMap {
* Returns the root node for the given destination type
*/
protected DestinationMapNode getRootNode(ActiveMQDestination key) {
if (key.isTemporary()){
if (key.isTemporary()) {
if (key.isQueue()) {
return tempQueueRootNode;
} else {
@ -232,14 +232,14 @@ public class DestinationMap {
tempTopicRootNode = new DestinationMapNode(null);
}
public boolean isEmpty(){
public boolean isEmpty() {
return queueRootNode.isEmpty() && topicRootNode.isEmpty() && tempQueueRootNode.isEmpty() && tempTopicRootNode.isEmpty();
}
public static Set union(Set existing, Set candidates) {
if ( candidates != null ) {
if (candidates != null) {
if (existing != null) {
for (Iterator<Object> iterator = existing.iterator(); iterator.hasNext();) {
for (Iterator<Object> iterator = existing.iterator(); iterator.hasNext(); ) {
Object toMatch = iterator.next();
if (!candidates.contains(toMatch)) {
iterator.remove();
@ -248,7 +248,7 @@ public class DestinationMap {
} else {
existing = candidates;
}
} else if ( existing != null ) {
} else if (existing != null) {
existing.clear();
}
return existing;