1 files changed, 23 insertions, 0 deletions
diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
index aec5796867..f71eef05bd 100644
--- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Util.java
@@ -51,6 +51,7 @@ public abstract class Util
     private boolean _useMultipleConnections;
     private int _windowSize = 100;
     private String _subject;
+    private String _filter;
 
     protected Util(String[] args)
     {
@@ -120,6 +121,13 @@ public abstract class Util
                 .hasArg(false)
                 .create('Z'));
 
+        if(hasFilterOption())
+            options.addOption(OptionBuilder.withLongOpt("filter")
+                .withDescription("filter, e.g. exact-subject=hello; matching-subject=%.a.#")
+                .hasArg(true)
+                .withArgName("<TYPE>=<VALUE>")
+                .create('F'));
+
 
         if(hasTxnOption())
         {
@@ -224,6 +232,11 @@ public abstract class Util
             _password = cmdLine.getOptionValue('w');
         }
 
+        if(cmdLine.hasOption('F'))
+        {
+            _filter = cmdLine.getOptionValue('F');
+        }
+
         _port = Integer.parseInt(portStr);
 
         _containerName = cmdLine.getOptionValue('C');
@@ -327,6 +340,11 @@ public abstract class Util
 
     }
 
+    protected boolean hasFilterOption()
+    {
+        return false;
+    }
+
     protected boolean hasSubjectOption()
     {
         return false;
@@ -486,4 +504,9 @@ public abstract class Util
     {
         _windowSize = windowSize;
     }
+
+    public String getFilter()
+    {
+        return _filter;
+    }
 }