diff options
| author | Fraser Adams <fadams@apache.org> | 2014-07-06 13:53:23 +0000 |
|---|---|---|
| committer | Fraser Adams <fadams@apache.org> | 2014-07-06 13:53:23 +0000 |
| commit | 7f4550b66619ed14378c188972e72c319c79f9bc (patch) | |
| tree | bf69acb4bd8fe3d1e1433697e5d8fcb1b8103653 /java/broker-core/src | |
| parent | 9b732ce281074defc9d8ab260af572edb844c9cc (diff) | |
| download | qpid-python-7f4550b66619ed14378c188972e72c319c79f9bc.tar.gz | |
QPID-5820: added better fix to the problem of arguments not being set. The real issue turned out to be that the create method on BindingImpl was being called by AbstractExchange after it called addBinding, but the addBinding method is the one that results in the QMF Binding instance being created. In other words the QMF Binding instance was getting constructed before the resolveAutomatedAttribute stuff
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1608201 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-core/src')
| -rw-r--r-- | java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java | 2 | ||||
| -rw-r--r-- | java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java b/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java index 2115ac9ba0..8eb0b4feb0 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java @@ -70,8 +70,6 @@ public class BindingImpl _bindingKey = getName(); _queue = queue; _exchange = exchange; - - setArguments((Map<String, Object>)getActualAttributes().get(ARGUMENTS)); } @Override diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index 95efc4295c..58ffd88b85 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -696,11 +696,9 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>> attributes.put(Binding.ARGUMENTS, arguments); BindingImpl b = new BindingImpl(attributes, queue, this); + b.create(); // Must be called before addBinding as it resolves automated attributes. addBinding(b); - b.create(); - - return true; } else if(force) |