diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2013-06-02 08:27:14 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2013-06-02 08:27:14 +0000 |
| commit | 97e3a351357a2d599f9b07a9f84d8e542f9f51cf (patch) | |
| tree | d9b99e7a3c7d40fd7637fac446cf971d3be5b740 /qpid/java | |
| parent | 58899e7c6e228192388159dd8ebb9809acadf128 (diff) | |
| download | qpid-python-97e3a351357a2d599f9b07a9f84d8e542f9f51cf.tar.gz | |
QPID-4897 : [Java Broker] add ability to test for existence of binding purely on arguments
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1488650 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
4 files changed, 25 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index 58c2b33041..803aeceab8 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -255,6 +255,22 @@ public abstract class AbstractExchange implements Exchange return false; } + + public final boolean isBound(Map<String, Object> arguments) + { + for(Binding b : _bindings) + { + if(((b.getArguments() == null || b.getArguments().isEmpty()) + ? (arguments == null || arguments.isEmpty()) + : b.getArguments().equals(arguments))) + { + return true; + } + } + return false; + } + + @Override public final boolean isBound(String bindingKey, Map<String, Object> arguments) { diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java index ccf955ed1c..dad6e60bfe 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java @@ -284,6 +284,12 @@ public class DefaultExchange implements Exchange } @Override + public boolean isBound(Map<String, Object> arguments) + { + return (arguments == null || arguments.isEmpty()) && hasBindings(); + } + + @Override public boolean isBound(String bindingKey) { return _virtualHost.getQueueRegistry().getQueue(bindingKey) != null; diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java index d483c3b29b..eba63558ca 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java @@ -155,6 +155,8 @@ public interface Exchange extends ExchangeReferrer boolean isBound(String bindingKey, Map<String, Object> arguments); + boolean isBound(Map<String, Object> arguments); + void removeReference(ExchangeReferrer exchange); void addReference(ExchangeReferrer exchange); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java index 110c7be50a..74a90374cb 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java @@ -1173,7 +1173,7 @@ public class ServerSessionDelegate extends SessionDelegate } else if(exchange != null && method.hasArguments()) { - result.setArgsNotMatched(!exchange.isBound(null, method.getArguments(), null)); + result.setArgsNotMatched(!exchange.isBound(method.getArguments())); } |