From a1079066053d240cf0012fd71b4f9f4cbeef917d Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Sun, 2 Jun 2013 08:27:14 +0000
Subject: 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/qpid@1488650 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/qpid/server/exchange/AbstractExchange.java    | 16 ++++++++++++++++
 .../org/apache/qpid/server/exchange/DefaultExchange.java |  6 ++++++
 .../java/org/apache/qpid/server/exchange/Exchange.java   |  2 ++
 .../qpid/server/transport/ServerSessionDelegate.java     |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 58c2b33041..803aeceab8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/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/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
index ccf955ed1c..dad6e60bfe 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
@@ -283,6 +283,12 @@ public class DefaultExchange implements Exchange
         return (arguments == null || arguments.isEmpty()) && isBound(bindingKey);
     }
 
+    @Override
+    public boolean isBound(Map<String, Object> arguments)
+    {
+        return (arguments == null || arguments.isEmpty()) && hasBindings();
+    }
+
     @Override
     public boolean isBound(String bindingKey)
     {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index d483c3b29b..eba63558ca 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/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/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
index 110c7be50a..74a90374cb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
+++ b/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()));
         }
 
 
-- 
cgit v1.2.1