Merging bug 21974 onto default

Author: Matthew Sackman

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -85,13 +85,15 @@ public static void main(String[] args) {
             int maxRedirects     = intArg(cmd, 'd', 0);
             int timeLimit        = intArg(cmd, 'z', 0);
             List flags           = lstArg(cmd, 'f');
+            int frameMax         = intArg(cmd, 'M', 0);
 
             //setup
             String id = UUID.randomUUID().toString();
             Stats stats = new Stats(1000L * samplingInterval);            
             ConnectionFactory factory = new ConnectionFactory();
             factory.setHost(hostName);
             factory.setPort(portNumber);
+            factory.setRequestedFrameMax(frameMax);
 
             Thread[] consumerThreads = new Thread[consumerCount];
             Connection[] consumerConnections = new Connection[consumerCount];
@@ -175,6 +177,7 @@ private static Options getOptions() {
         Option flag =     new Option("f", "flag",      true, "message flag");
         flag.setArgs(Option.UNLIMITED_VALUES);
         options.addOption(flag);
+        options.addOption(new Option("M", "framemax",  true, "frame max"));
         return options;
     }