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 09:51:45 UTC
qpid-broker-j git commit: QPID-7771: [Java Broker] Guard case where
bindings arguments are null
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 22877253b -> ec3ecb739
QPID-7771: [Java Broker] Guard case where bindings arguments are null
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/ec3ecb73
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ec3ecb73
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ec3ecb73
Branch: refs/heads/master
Commit: ec3ecb739315273cfe1ebb953147145df52ec891
Parents: 2287725
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Sep 13 10:51:34 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 13 10:51:34 2017 +0100
----------------------------------------------------------------------
.../org/apache/qpid/server/exchange/DirectExchangeImpl.java | 5 ++---
.../org/apache/qpid/server/exchange/FanoutExchangeImpl.java | 4 ++--
.../apache/qpid/server/exchange/topic/TopicExchangeResult.java | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec3ecb73/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
index 7ce9c37..3f4d6e8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
@@ -111,7 +111,7 @@ public class DirectExchangeImpl extends AbstractExchange<DirectExchangeImpl> imp
filteredDestinations = new HashMap<>(_filteredDestinations);
FilterManager messageFilter = FilterSupport.createMessageFilter(arguments, destination);
- String replacementRoutingKey = arguments.containsKey(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY)
+ String replacementRoutingKey = arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY) != null
? String.valueOf(arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY))
: null;
filteredDestinations.put(destination,
@@ -149,10 +149,9 @@ public class DirectExchangeImpl extends AbstractExchange<DirectExchangeImpl> imp
}
unfilteredDestinations = new HashMap<>(_unfilteredDestinations);
- Object replacementRoutingKey = arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY);
+ Object replacementRoutingKey = arguments == null ? null : arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY);
unfilteredDestinations.put(destination, replacementRoutingKey == null ? null : String.valueOf(replacementRoutingKey));
return new BindingSet(Collections.unmodifiableMap(unfilteredDestinations), Collections.unmodifiableMap(filteredDestinations));
-
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec3ecb73/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
index 683d28b..a950022 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
@@ -82,7 +82,7 @@ class FanoutExchangeImpl extends AbstractExchange<FanoutExchangeImpl> implements
new HashMap<>(filteredDestinations.get(destination));
FilterManager filterManager = FilterSupport.createMessageFilter(arguments, destination);
- String replacementRoutingKey = arguments.containsKey(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY)
+ String replacementRoutingKey = arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY) != null
? String.valueOf(arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY))
: null;
@@ -110,7 +110,7 @@ class FanoutExchangeImpl extends AbstractExchange<FanoutExchangeImpl> implements
unfilteredDestinations.computeIfAbsent(destination, messageDestination -> new HashMap<>());
String replacementRoutingKey = null;
- if (arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY) != null)
+ if (arguments != null && arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY) != null)
{
replacementRoutingKey = String.valueOf(arguments.get(BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec3ecb73/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
index 86b1f23..efb51af 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
@@ -57,7 +57,7 @@ public final class TopicExchangeResult implements TopicMatcherResult
public void addBinding(AbstractExchange.BindingIdentifier binding, Map<String, Object> bindingArguments)
{
- Object keyObject = bindingArguments.get(Binding.BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY);
+ Object keyObject = bindingArguments != null ? bindingArguments.get(Binding.BINDING_ARGUMENT_REPLACEMENT_ROUTING_KEY) : null;
if (keyObject == null)
{
_replacementKeys.remove(binding.getDestination());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org