diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-03-09 10:14:39 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-03-09 10:14:39 +0000 |
| commit | a9bfe3c87c024deb64e44e97e16b74a3e99b86c7 (patch) | |
| tree | 0dcd668520a84f47d78931181eaa1a0ff0387123 /qpid | |
| parent | 9786587beafe074b104e9eee094bffd5745d35b4 (diff) | |
| download | qpid-python-a9bfe3c87c024deb64e44e97e16b74a3e99b86c7.tar.gz | |
QPID-5617 : [Java Broker] tidy-up of binding child add/remove from queue... dulpicate functionality
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575687 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
3 files changed, 2 insertions, 10 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java index 0bba5c7967..9fdae72188 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java @@ -94,7 +94,6 @@ public class BindingImpl //Perform ACLs queue.getVirtualHost().getSecurityManager().authoriseCreateBinding(this); - _queue.bindingCreated(this); _logSubject = new BindingLogSubject(_bindingKey,exchange,queue); getEventLogger().message(_logSubject, BindingMessages.CREATED(String.valueOf(getArguments()), getArguments() != null diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java index b758365039..e9c5f8206a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java @@ -225,6 +225,4 @@ public interface AMQQueue<X extends AMQQueue<X>> long getUnacknowledgedMessages(); - - void bindingCreated(Binding<BindingImpl> binding); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java index 8e791cd326..ab3da6224e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java @@ -958,11 +958,13 @@ public abstract class AbstractQueue break; } } + childAdded(binding); } public void removeBinding(final BindingImpl binding) { _bindings.remove(binding); + childRemoved(binding); } public Collection<BindingImpl> getBindings() @@ -3083,13 +3085,6 @@ public abstract class AbstractQueue } } - @Override - public void bindingCreated(final Binding<BindingImpl> binding) - { - childAdded(binding); - binding.addChangeListener(_deletedChildListener); - } - private class DeletedChildListener implements ConfigurationChangeListener { @Override |