From c35da6b6fde5767ea8532a512ac288bf1443bdf8 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 5 Jul 2010 11:16:17 +0000 Subject: QPID-2681 : Correcly process global configuration, added test to cover git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@960549 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/configuration/TopicConfiguration.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 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 a16198788f..c7a195f9e4 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 @@ -77,8 +77,6 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC for (int index = 0; index < topics; index++) { - TopicConfig topic = new TopicConfig(); - Configuration topicSubset = _configuration.subset("topic(" + index + ")"); // This will occur when we have a subscriptionName that is bound to a @@ -88,6 +86,8 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC break; } + TopicConfig topic = new TopicConfig(); + topic.setConfiguration(VIRTUALHOSTS_VIRTUALHOST_TOPICS + ".topic", topicSubset ); String name = _configuration.getString("topic(" + index + ").name"); @@ -169,6 +169,7 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC */ public ConfigurationPlugin getConfiguration(AMQQueue queue) { + //Create config with global topic configuration TopicConfig config = new TopicConfig(); // Add global topic configuration @@ -225,7 +226,15 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC } } - // Apply subscription specfic config. + //todo we don't account for wild cards here. only explict 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); -- cgit v1.2.1