merge heads

rade · rade · commit a4563f23778f · 2014-04-28T15:17:23.000+01:00
diff --git a/test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java
@@ -141,7 +141,7 @@ public void handleNack(long deliveryTag, boolean multiple) throws IOException {
         closeAndWaitForRecovery();
         expectChannelRecovery(channel);
         channel.confirmSelect();
-        channel.basicPublish("", q, true, false, null, "mandatory1".getBytes());
+        basicPublishVolatile(q);
         waitForConfirms(channel);
         wait(latch);
     }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public void handleNack(long deliveryTag, boolean multiple) throws IOException {`
`141`	`141`	`closeAndWaitForRecovery();`
`142`	`142`	`expectChannelRecovery(channel);`
`143`	`143`	`channel.confirmSelect();`
`144`		`- channel.basicPublish("", q, true, false, null, "mandatory1".getBytes());`
	`144`	`+ basicPublishVolatile(q);`
`145`	`145`	`waitForConfirms(channel);`
`146`	`146`	`wait(latch);`
`147`	`147`	`}`