From e06552778b981fad355d3eb5b03df84de65380e6 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 5 Jul 2010 11:14:10 +0000 Subject: QPID-1447 : Move Queue Reconfiguration to the Queue rather than the Binding Factory git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@960541 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/server/binding/BindingFactory.java | 8 -------- .../main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java index b24a326ed3..7393f27ab4 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java @@ -204,14 +204,6 @@ public class BindingFactory getConfigStore().addConfiguredObject(b); b.logCreation(); - //Reconfigure the queue for to reflect this new binding. - ConfigurationPlugin config = queue.getVirtualHost().getConfiguration().getQueueConfiguration(queue); - - if (config != null) - { - // Reconfigure with new config. - queue.configure(config); - } return true; } else diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 451d59b2e9..c4567b2e8b 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -503,6 +503,15 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener break; } } + + //Reconfigure the queue for to reflect this new binding. + ConfigurationPlugin config = getVirtualHost().getConfiguration().getQueueConfiguration(this); + + if (config != null) + { + // Reconfigure with new config. + configure(config); + } } public int getBindingCountHigh() -- cgit v1.2.1