1 files changed, 3 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java b/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
index 5f646c15db..f2ebe41d26 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
@@ -22,16 +22,17 @@ package org.apache.qpid.server.filter;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.Filterable;
 
 /**
  * Represents an expression
  */
-public interface Expression
+public interface Expression<E extends Exception>
 {
 
     /**
      * @return the value of this expression
      */
-    public Object evaluate(AMQMessage message) throws AMQException;
+    public Object evaluate(Filterable<E> message) throws E;
 
 }