1 files changed, 4 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java b/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
index f5454afae5..1311178fb1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.filter;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.Filterable;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -70,7 +71,7 @@ public final class XPathExpression implements BooleanExpression {
     private final XPathEvaluator evaluator;
 
     static public interface XPathEvaluator {
-        public boolean evaluate(AMQMessage message) throws AMQException;
+        public boolean evaluate(Filterable message) throws AMQException;
     }
 
     XPathExpression(String xpath) {
@@ -92,7 +93,7 @@ public final class XPathExpression implements BooleanExpression {
         }
     }
 
-    public Object evaluate(AMQMessage message) throws AMQException {
+    public Object evaluate(Filterable message) throws AMQException {
 //        try {
 //FIXME this is flow to disk work
 //            if( message.isDropped() )
@@ -117,7 +118,7 @@ public final class XPathExpression implements BooleanExpression {
      * @return true if the expression evaluates to Boolean.TRUE.
      * @throws AMQException
      */
-    public boolean matches(AMQMessage message) throws AMQException
+    public boolean matches(Filterable message) throws AMQException
     {
         Object object = evaluate(message);
         return object!=null && object==Boolean.TRUE;