Merging bug22892 onto default

Author: Matthew Sackman

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

@@ -34,13 +34,15 @@
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.AMQP.BasicProperties;
 
-public class PersistentTransactions
-    extends TransactionsBase
-{
+public class PersistentTransactions extends TransactionsBase {
 
-    protected BasicProperties getMessageProperties()
-    {
+    protected BasicProperties getMessageProperties() {
         return MessageProperties.PERSISTENT_TEXT_PLAIN;
     }
 
+    @Override
+    protected boolean declareDurableQueues() {
+        return true;
+    }
+
 }

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

@@ -55,7 +55,11 @@ protected void setUp()
     }
 
     protected void createResources() throws IOException {
-        channel.queueDeclare(Q, false, false, false, null);
+        channel.queueDeclare(Q, declareDurableQueues(), false, false, null);
+    }
+
+    protected boolean declareDurableQueues() {
+        return false;
     }
 
     protected void releaseResources() throws IOException {

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

@@ -105,8 +105,9 @@ public static void main(String[] args) {
                 Channel channel = conn.createChannel();
                 if (consumerTxSize > 0) channel.txSelect();
                 channel.exchangeDeclare(exchangeName, exchangeType);
-                Queue.DeclareOk res = channel.queueDeclare();
-                String queueName = res.getQueue();
+                String queueName =
+                        channel.queueDeclare("", flags.contains("persistent"),
+                                             true, false, null).getQueue();
                 QueueingConsumer consumer = new QueueingConsumer(channel);
                 if (prefetchCount > 0) channel.basicQos(prefetchCount);
                 channel.basicConsume(queueName, autoAck, consumer);