merge bug24120 into default

Author: rade

src/com/rabbitmq/client/ConsumerCancelledException.java

@@ -24,7 +24,6 @@ public class ConsumerCancelledException extends RuntimeException implements
     /** Default for non-checking. */
     private static final long serialVersionUID = 1L;
 
-    @Override
     public ConsumerCancelledException sensibleClone() {
         try {
             return (ConsumerCancelledException) super.clone();

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

@@ -57,7 +57,6 @@ public void testConsumerCancellationInterruptsQueuingConsumerWait()
         final QueueingConsumer consumer = new QueueingConsumer(channel);
         Runnable receiver = new Runnable() {
 
-            @Override
             public void run() {
                 try {
                     try {

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

@@ -108,9 +108,10 @@ public void testTTLMustBePositive() throws Exception {
     public void testQueueRedeclareEquivalence() throws Exception {
         declareQueue(TTL_QUEUE_NAME, 10);
         try {
-             declareQueue(TTL_QUEUE_NAME, 20);
+            declareQueue(TTL_QUEUE_NAME, 20);
+            fail("Should not be able to redeclare with different TTL");
         } catch(IOException ex) {
-            checkShutdownSignal(AMQP.NOT_ALLOWED, ex);
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, ex);
         }
     }
 

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

@@ -18,6 +18,7 @@
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.test.BrokerTestCase;
 import java.io.IOException;
 
@@ -229,15 +230,10 @@ public void testUnknownTagAck()
         basicGet();
         basicAck();
         basicAck(latestTag+1, true);
-        try {
-            txCommit();
-            fail("expected exception");
-        }
-        catch (IOException e) {
-            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
-        }
-        connection = null;
-        openConnection();
+        // "On a transacted channel, this check MUST be done immediately and
+        // not delayed until a Tx.Commit."
+        expectError(AMQP.PRECONDITION_FAILED);
+        openChannel();
     }
 
     /*