Updated Branches: refs/heads/camel-2.12.x af90f52cb -> 323f1d1c1 refs/heads/master a032a4881 -> 87a609c33
fix for incorrect patch for 6767. Messages sould be acked only when the channel is NOT autoAck. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87a609c3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87a609c3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87a609c3 Branch: refs/heads/master Commit: 87a609c33bb7d0ddc078d2b4cb4027e290aefd82 Parents: a032a48 Author: Fergus Nelson <fergus.nel...@gmail.com> Authored: Thu Oct 10 13:56:48 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Oct 10 15:26:34 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/87a609c3/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java index 468e728..acc95d7 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java @@ -122,7 +122,7 @@ public class RabbitMQConsumer extends DefaultConsumer { consumer.getProcessor().process(exchange); long deliveryTag = envelope.getDeliveryTag(); - if (consumer.endpoint.isAutoAck()) { + if (!consumer.endpoint.isAutoAck()) { log.trace("Acknowledging receipt [delivery_tag={}]", deliveryTag); channel.basicAck(deliveryTag, false); }
