Bind to pre-declared queue for published-only test

Fixes #43

Author: acogoluegnes

src/main/java/com/rabbitmq/perf/MulticastParams.java

@@ -266,7 +266,7 @@ public Consumer createConsumer(Connection connection, Stats stats, String id) th
     public boolean shouldConfigureQueues() {
         // don't declare any queues when --predeclared is passed,
         // otherwise unwanted server-named queues without consumers will pile up. MK.
-        return consumerCount == 0 && !predeclared && !(queueNames.size() == 0);
+        return consumerCount == 0 && !(queueNames.size() == 0);
     }
 
     public List<String> configureQueues(Connection connection, String id) throws IOException {
@@ -275,7 +275,11 @@ public List<String> configureQueues(Connection connection, String id) throws IOE
             channel.exchangeDeclare(exchangeName, exchangeType);
         }
         // To ensure we get at-least 1 default queue:
-        if (queueNames.isEmpty()) {
+        // (don't declare any queues when --predeclared is passed,
+        // otherwise unwanted server-named queues without consumers will pile up.
+        // see https://github.com/rabbitmq/rabbitmq-perf-test/issues/25 and
+        // https://github.com/rabbitmq/rabbitmq-perf-test/issues/43)
+        if (!predeclared && queueNames.isEmpty()) {
             queueNames.add("");
         }
         List<String> generatedQueueNames = new ArrayList<String>();
@@ -288,7 +292,10 @@ public List<String> configureQueues(Connection connection, String id) throws IOE
                                      queueArguments).getQueue();
             }
             generatedQueueNames.add(qName);
-            channel.queueBind(qName, exchangeName, id);
+            // not allowed to bind to the default exchange
+            if (!"".equals(exchangeName) && !"amq.default".equals(exchangeName)) {
+                channel.queueBind(qName, exchangeName, id);
+            }
         }
         channel.abort();
 

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -59,7 +59,7 @@ public static void main(String[] args) {
             testID                   = strArg(cmd, 'd', "test-"+testID);
             String exchangeType      = strArg(cmd, 't', "direct");
             String exchangeName      = getExchangeName(cmd, exchangeType);
-            String queueNames        = strArg(cmd, 'u', "");
+            String queueNames        = strArg(cmd, 'u', null);
             String routingKey        = strArg(cmd, 'k', null);
             boolean randomRoutingKey = cmd.hasOption('K');
             int samplingInterval     = intArg(cmd, 'i', 1);
@@ -144,7 +144,7 @@ public static void main(String[] args) {
             p.setProducerChannelCount(  producerChannelCount);
             p.setProducerMsgCount(      producerMsgCount);
             p.setProducerTxSize(        producerTxSize);
-            p.setQueueNames(            asList(queueNames.split(",")));
+            p.setQueueNames(            queueNames == null ? null : asList(queueNames.split(",")));
             p.setRoutingKey(            routingKey);
             p.setRandomRoutingKey(      randomRoutingKey);
             p.setProducerRateLimit(     producerRateLimit);