Those clearXXXListeners() are not needed, so clean up a bit.

Author: Simon MacMullen

test/src/com/rabbitmq/examples/perf/MulticastParams.java

@@ -142,7 +142,8 @@ public int getMinMsgSize() {
         return minMsgSize;
     }
 
-    public Producer createProducer(Connection connection, Channel channel, Stats stats, String id) throws IOException {
+    public Producer createProducer(Connection connection, Stats stats, String id) throws IOException {
+        Channel channel = connection.createChannel();
         if (producerTxSize > 0) channel.txSelect();
         if (confirm >= 0) channel.confirmSelect();
         if (!exchangeExists(connection, exchangeName)) {
@@ -158,9 +159,10 @@ public Producer createProducer(Connection connection, Channel channel, Stats sta
         return producer;
     }
 
-    public Consumer createConsumer(Connection connection, Channel channel, Stats stats, String id) throws IOException {
+    public Consumer createConsumer(Connection connection, Stats stats, String id) throws IOException {
+        Channel channel = connection.createChannel();
         if (consumerTxSize > 0) channel.txSelect();
-        String qName = configureQueue(connection, channel, id);
+        String qName = configureQueue(connection, id);
         if (prefetchCount > 0) channel.basicQos(prefetchCount);
         return new Consumer(channel, id, qName,
                                          consumerTxSize, autoAck, multiAckEvery,
@@ -171,7 +173,8 @@ public boolean shouldConfigureQueue() {
         return consumerCount == 0 && !queueName.equals("");
     }
 
-    public String configureQueue(Connection connection, Channel channel, String id) throws IOException {
+    public String configureQueue(Connection connection, String id) throws IOException {
+        Channel channel = connection.createChannel();
         if (!exchangeExists(connection, exchangeName)) {
             channel.exchangeDeclare(exchangeName, exchangeType);
         }
@@ -183,6 +186,7 @@ public String configureQueue(Connection connection, Channel channel, String id)
                                          null).getQueue();
         }
         channel.queueBind(qName, exchangeName, id);
+        channel.close();
         return qName;
     }
 

test/src/com/rabbitmq/examples/perf/MulticastSet.java

@@ -50,30 +50,25 @@ public void run(boolean announceStartup) throws IOException, InterruptedExceptio
             }
             Connection conn = factory.newConnection();
             consumerConnections[i] = conn;
-            Channel channel = conn.createChannel();
-            Thread t = new Thread(params.createConsumer(conn, channel, stats, id));
+            Thread t = new Thread(params.createConsumer(conn, stats, id));
             consumerThreads[i] = t;
         }
 
         if (params.shouldConfigureQueue()) {
             Connection conn = factory.newConnection();
-            Channel channel = conn.createChannel();
-            params.configureQueue(conn, channel, id);
+            params.configureQueue(conn, id);
             conn.close();
         }
 
         Thread[] producerThreads = new Thread[params.getProducerCount()];
         Connection[] producerConnections = new Connection[producerThreads.length];
-        Channel[] producerChannels = new Channel[producerConnections.length];
-        for (int i = 0; i < producerChannels.length; i++) {
+        for (int i = 0; i < producerThreads.length; i++) {
             if (announceStartup) {
                 System.out.println("starting producer #" + i);
             }
             Connection conn = factory.newConnection();
             producerConnections[i] = conn;
-            Channel channel = conn.createChannel();
-            producerChannels[i] = channel;
-            Thread t = new Thread(params.createProducer(conn, channel, stats, id));
+            Thread t = new Thread(params.createProducer(conn, stats, id));
             producerThreads[i] = t;
         }
 
@@ -87,8 +82,6 @@ public void run(boolean announceStartup) throws IOException, InterruptedExceptio
 
         for (int i = 0; i < producerThreads.length; i++) {
             producerThreads[i].join();
-            producerChannels[i].clearReturnListeners();
-            producerChannels[i].clearConfirmListeners();
             producerConnections[i].close();
         }