merge bug19551 into default

Author: tonyg

test/src/com/rabbitmq/client/test/functional/DurableOnTransient.java

@@ -84,6 +84,7 @@ public void testBind()
             B = true; 
         }
         channel.queueDelete(ticket, Q);
+        channel.exchangeDelete(ticket, X);
 
         assertTrue(B);
 

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

@@ -108,7 +108,7 @@ private void runIt() throws IOException {
         channel.queueDeclare(ticket, queueName);
 
         String exchangeName = "test completion";
-        channel.exchangeDeclare(ticket, exchangeName, "fanout");
+        channel.exchangeDeclare(ticket, exchangeName, "fanout", false, false, true, null);
 
         String completionQueue = channel.queueDeclare(ticket).getQueue();
         channel.queueBind(ticket, completionQueue, exchangeName, "");

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

@@ -148,16 +148,22 @@ private void runIt() throws IOException {
 
         String queueName = "test queue";
         _channel.queueDeclare(_ticket, queueName, shouldPersist());
-
-        String exchangeName = "test completion";
-        _channel.exchangeDeclare(_ticket, exchangeName, "fanout");
-
+        
         if (shouldCommit()) {
             _channel.txSelect();
         }
         sendBatch(queueName);
 
         if (_sendCompletion) {
+            // Declaring this exchange as auto-delete is a bit dodgy because of a
+            // race condition with the consumer declaring the same exchange to be
+            // auto-delete and hence pulling the rug out from underneath the producer's
+            // feet.
+            // Hence we're delaying a possible re-declaration until as late as possible.
+            // Ideally you would use a global lock around both critical sections,
+            // but thread safety has gone out of fashion these days.
+            String exchangeName = "test completion";
+            _channel.exchangeDeclare(_ticket, exchangeName, "fanout", false, false, true, null);
             _channel.basicPublish(_ticket, exchangeName, "", MessageProperties.BASIC, new byte[0]);
             if (shouldCommit())
                 _channel.txCommit();

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

@@ -458,7 +458,7 @@ public void tryBasicReturn() throws IOException {
         log("About to try mandatory/immediate publications");
 
         String mx = "mandatoryTestExchange";
-        _ch1.exchangeDeclare(_ticket, mx, "fanout");
+        _ch1.exchangeDeclare(_ticket, mx, "fanout", false, false, true, null);
 
         returnCell = new BlockingCell<Object>();
         _ch1.basicPublish(_ticket, mx, "", true, false, null, "one".getBytes());