You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/09/13 12:19:45 UTC
qpid-broker-j git commit: QPID-7771: [Java Broker] Ensure that
binding recovery treats null binding arguments in the same way as
Exchange#bind
Repository: qpid-broker-j
Updated Branches:
refs/heads/master ec3ecb739 -> 7b4fb2b80
QPID-7771: [Java Broker] Ensure that binding recovery treats null binding arguments in the same way as Exchange#bind
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/7b4fb2b8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/7b4fb2b8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/7b4fb2b8
Branch: refs/heads/master
Commit: 7b4fb2b80a687c22f73435173fd29c2c1280ee96
Parents: ec3ecb7
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Sep 13 12:58:59 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 13 12:58:59 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/server/exchange/AbstractExchange.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7b4fb2b8/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 21635b5..c7cfa93 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -208,7 +208,8 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
final MessageDestination messageDestination = getOpenedMessageDestination(b.getDestination());
if (messageDestination != null)
{
- onBind(new BindingIdentifier(b.getBindingKey(), messageDestination), b.getArguments());
+ Map<String, Object> arguments = b.getArguments() == null ? Collections.emptyMap() : b.getArguments();
+ onBind(new BindingIdentifier(b.getBindingKey(), messageDestination), arguments);
messageDestination.linkAdded(this, b);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org