You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/10 15:27:55 UTC
[1/2] git commit: fix for incorrect patch for 6767. Messages sould be
acked only when the channel is NOT autoAck.
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 <fe...@gmail.com>
Authored: Thu Oct 10 13:56:48 2013 +0100
Committer: Claus Ibsen <da...@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);
}
[2/2] git commit: fix for incorrect patch for 6767. Messages sould be
acked only when the channel is NOT autoAck.
Posted by da...@apache.org.
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/323f1d1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/323f1d1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/323f1d1c
Branch: refs/heads/camel-2.12.x
Commit: 323f1d1c1115d0cab7b2b360d8f94b860f5aa309
Parents: af90f52
Author: Fergus Nelson <fe...@gmail.com>
Authored: Thu Oct 10 13:56:48 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 10 15:27:08 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/323f1d1c/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);
}