From 2c7aeaccc3fa471f54aad62f0fc4dd455ca0179f Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Wed, 20 Aug 2008 16:26:16 +0000 Subject: QPID-1202: TopicExchance.removeFilteredQueue: if there are no instances of the filter, it's ok to remove it. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@687382 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/exchange/TopicExchange.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java index 59a8339346..bc303a219d 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java @@ -216,17 +216,20 @@ public class TopicExchange extends AbstractExchange if(filters != null) { Integer instances = filters.get(filter); - if(instances == 1) + if(instances != null) { - filters.remove(filter); - if(filters.isEmpty()) + if(instances == 1) { - _filteredQueues.remove(queue); + filters.remove(filter); + if(filters.isEmpty()) + { + _filteredQueues.remove(queue); + } + } + else + { + filters.put(filter, instances - 1); } - } - else if(instances != null) - { - filters.put(filter, instances - 1); } } -- cgit v1.2.1