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

http://issues.apache.org/activemq/browse/AMQ-808 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@420707 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-07-11 04:20:03 +00:00
parent 23e80fdbc1
commit eafa72d7cb
3 changed files with 82 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-core/src/main/java/org/apache/activemq/filter/DestinationMap.java
View File

@ -162,17 +162,20 @@ public class DestinationMap {
/**
* @param dest
* @return
*/
public void removeAll(ActiveMQDestination key) {
public Set removeAll(ActiveMQDestination key) {
Set rc = new HashSet();
if (key.isComposite()) {
ActiveMQDestination[] destinations = key.getCompositeDestinations();
for (int i = 0; i < destinations.length; i++) {
removeAll(destinations[i]);
rc.add( removeAll(destinations[i]) );
}
return;
return rc;
}
String[] paths = key.getDestinationPaths();
getRootNode(key).removeAll(paths, 0);
getRootNode(key).removeAll(rc, paths, 0);
return rc;
}
/**

70
activemq-core/src/main/java/org/apache/activemq/filter/DestinationMapNode.java
View File

@ -93,6 +93,31 @@ public class DestinationMapNode {
return values;
}
/**
* Returns a mutable List of the values available at this node in the tree
*/
public List removeValues() {
ArrayList v = new ArrayList(values);
parent.getAnyChildNode().getValues().removeAll(v);
values.clear();
pruneIfEmpty();
return v;
}
public Set removeDesendentValues() {
Set answer = new HashSet();
removeDesendentValues(answer);
return answer;
}
protected void removeDesendentValues(Set answer) {
if (anyChild != null) {
anyChild.removeDesendentValues(answer);
}
answer.addAll(removeValues());
}
/**
* Returns a list of all the values from this node down the tree
*/
@ -133,20 +158,45 @@ public class DestinationMapNode {
}
}
public void removeAll(String[] paths, int idx) {
if (idx >= paths.length) {
values.clear();
pruneIfEmpty();
}
else {
if (idx == paths.length - 1) {
getAnyChildNode().getValues().clear();
public void removeAll(Set answer, String[] paths, int startIndex) {
// if (idx >= paths.length) {
// values.clear();
// pruneIfEmpty();
// }
// else {
// if (idx == paths.length - 1) {
// getAnyChildNode().getValues().clear();
// }
// else {
// getAnyChildNode().removeAll(paths, idx + 1);
// }
// getChildOrCreate(paths[idx]).removeAll(paths, ++idx);
// }
//
DestinationMapNode node = this;
for (int i = startIndex, size = paths.length; i < size && node != null; i++) {
String path = paths[i];
if (path.equals(ANY_DESCENDENT)) {
answer.addAll(node.removeDesendentValues());
break;
}
node.appendMatchingWildcards(answer, paths, i);
if (path.equals(ANY_CHILD)) {
node = node.getAnyChildNode();
}
else {
getAnyChildNode().removeAll(paths, idx + 1);
node = node.getChild(path);
}
getChildOrCreate(paths[idx]).removeAll(paths, ++idx);
}
if (node != null) {
answer.addAll(node.removeValues());
}
}
protected void appendDescendantValues(Set answer) {

15
activemq-core/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
View File

@ -285,6 +285,21 @@ public class DestinationMapTest extends TestCase {
assertMapValue("TEST.*.*", v3, v5);
assertMapValue("TEST.BAR.*", v3);
}
public void testAddAndRemove() throws Exception {
put("FOO.A", v1);
assertMapValue("FOO.>", v1);
put("FOO.B", v2);
assertMapValue("FOO.>", v1, v2);
Set set = map.removeAll(createDestination("FOO.A"));
assertMapValue("FOO.>", v2);
}
protected void loadSample2() {
put("TEST.FOO", v1);