From 8e4f09d70306350a9fd970ac5880300a791f8882 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 5 Jul 2010 11:17:23 +0000 Subject: QPID-2681 : Add final SCD testing for Topic and Subscriptions git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@960553 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/configuration/TopicConfiguration.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'java/broker/src/main') diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java index c7a195f9e4..8716fed8c1 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java @@ -204,14 +204,19 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC config.addConfiguration(boundToTopics.get(0)); } + // If we have a subscription then attempt to look it up. + String subscriptionName = queue.getName(); + // Apply subscription configurations - if (_subscriptions.containsKey(queue.getName())) + if (_subscriptions.containsKey(subscriptionName)) { - Map topics = _subscriptions.get(queue.getName()); + + //Get all the Configuration that this subscription is bound to. + Map topics = _subscriptions.get(subscriptionName); TopicConfig subscriptionSpecificConfig = null; - // See if we have a TopicConfig in topics for a topic we are bound to. + // See if we have a TopicConfig in topics for a topic we are bound to. for (Binding binding : queue.getBindings()) { if (binding.getExchange().getType().equals(TopicExchange.TYPE)) @@ -226,21 +231,19 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC } } - //todo we don't account for wild cards here. only explict matching and all subscriptions + //todo we don't account for wild cards here. only explicit matching and all subscriptions if (subscriptionSpecificConfig == null) { // lookup the binding to see if we have a match in the subscription configs subscriptionSpecificConfig = topics.get("#"); } - // Apply subscription specific config. if (subscriptionSpecificConfig != null) { config.addConfiguration(subscriptionSpecificConfig); } } - return config; } -- cgit v1.2.1