You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by fa...@apache.org on 2014/07/06 15:53:24 UTC
svn commit: r1608201 - in
/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server:
binding/BindingImpl.java exchange/AbstractExchange.java
Author: fadams
Date: Sun Jul 6 13:53:23 2014
New Revision: 1608201
URL: http://svn.apache.org/r1608201
Log:
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
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1608201&r1=1608200&r2=1608201&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java Sun Jul 6 13:53:23 2014
@@ -70,8 +70,6 @@ public class BindingImpl
_bindingKey = getName();
_queue = queue;
_exchange = exchange;
-
- setArguments((Map<String, Object>)getActualAttributes().get(ARGUMENTS));
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1608201&r1=1608200&r2=1608201&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Sun Jul 6 13:53:23 2014
@@ -696,11 +696,9 @@ public abstract class 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org