merge bug22252 into default (how does basic.recover affect basic.qos limits?)

Alexandru Scvortov · Alexandru Scvortov · commit f448f285d4ce · 2011-01-27T18:46:20.000Z
diff --git a/README-EXAMPLES b/README-EXAMPLES
@@ -82,3 +82,4 @@ SpammyTopicProducer - Sends lots of different topic messages over AMQP.
 StressPersister - Stress test for persister.
 TestMain - RabbitMQ server regression tests.
 TracerConcurrencyTest - Tests correct concurrency behaviour of RabbitMQ tracer.
+
diff --git a/test/src/com/rabbitmq/client/test/functional/QosTests.java b/test/src/com/rabbitmq/client/test/functional/QosTests.java
@@ -377,7 +377,7 @@ public void testRecoverReducesLimit() throws Exception {
         channel.basicRecover(true);
         drain(c, 2);
     }
-    
+
     protected void runLimitTests(int limit,
                                  boolean multiAck,
                                  boolean txMode,

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ public void testRecoverReducesLimit() throws Exception {`
`377`	`377`	`channel.basicRecover(true);`
`378`	`378`	`drain(c, 2);`
`379`	`379`	`}`
`380`		`-`
	`380`	`+`
`381`	`381`	`protected void runLimitTests(int limit,`
`382`	`382`	`boolean multiAck,`
`383`	`383`	`boolean txMode,`