1 files changed, 6 insertions, 5 deletions
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 06209c5458..7ff5e4ef96 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
@@ -24,12 +24,11 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 
-import org.apache.qpid.server.queue.IncomingMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.message.InboundMessage;
 
-import java.util.List;
-import java.util.Map;
+import java.util.ArrayList;
 
 public interface Exchange
 {
@@ -54,7 +53,7 @@ public interface Exchange
 
     void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException;
 
-    void route(IncomingMessage message) throws AMQException;
+    ArrayList<AMQQueue> route(InboundMessage message) throws AMQException;
 
 
     /**
@@ -93,6 +92,8 @@ public interface Exchange
      */
     boolean hasBindings();
 
-    
 
+    boolean isBound(String bindingKey, AMQQueue queue);
+
+    boolean isBound(String bindingKey);
 }