Merged bug19492 into default

Author: Emile Joubert

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

@@ -90,7 +90,7 @@ public static void main(String[] args) {
 
             //setup
             String id = UUID.randomUUID().toString();
-            Stats stats = new Stats(1000L * samplingInterval);            
+            Stats stats = new Stats(1000L * samplingInterval);
             ConnectionFactory factory = new ConnectionFactory();
             factory.setHost(hostName);
             factory.setPort(portNumber);
@@ -128,20 +128,10 @@ public static void main(String[] args) {
                 if (producerTxSize > 0) channel.txSelect();
                 channel.exchangeDeclare(exchangeName, exchangeType);
                 final Producer p = new Producer(channel, exchangeName, id,
-                                          flags, producerTxSize,
-                                          1000L * samplingInterval,
-                                          rateLimit, minMsgSize, timeLimit);
-                channel.setReturnListener(new ReturnListener() {
-                        public void handleBasicReturn(int replyCode,
-                                                      String replyText,
-                                                      String exchange,
-                                                      String routingKey,
-                                                      AMQP.BasicProperties properties,
-                                                      byte[] body)
-                            throws IOException {
-                            p.logBasicReturn();
-                        }
-                    });
+                                                   flags, producerTxSize,
+                                                   1000L * samplingInterval,
+                                                   rateLimit, minMsgSize, timeLimit);
+                channel.setReturnListener(p);                
                 Thread t = new Thread(p);
                 producerThreads[i] = t;
                 t.start();
@@ -209,7 +199,7 @@ private static List lstArg(CommandLine cmd, char opt) {
         return Arrays.asList(vals);
     }
 
-    public static class Producer implements Runnable {
+    public static class Producer implements Runnable, ReturnListener {
 
         private Channel channel;
         private String  exchangeName;
@@ -247,6 +237,15 @@ public Producer(Channel channel, String exchangeName, String id,
             this.message      = new byte[minMsgSize];
         }
 
+        public void handleBasicReturn(int replyCode,
+                                      String replyText,
+                                      String exchange,
+                                      String routingKey,
+                                      AMQP.BasicProperties properties,
+                                      byte[] body) throws IOException {
+            logBasicReturn();
+        }
+
         public synchronized void logBasicReturn() {
             basicReturnCount++;
         }