merged bug20010 into default

Author: tonyg

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

@@ -33,6 +33,7 @@
 
 import java.io.IOException;
 
+import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.AMQP.BasicProperties;
 
@@ -256,7 +257,9 @@ public void testUnknownTagAck()
         try {
             txCommit();
             fail("expected exception");
-        } catch (IOException e) {}
+        }
+        catch (IOException e) {}
+        catch (AlreadyClosedException e) {}
         connection = null;
         openConnection();
     }