CAMEL-9405: Polsihed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d84c66f5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d84c66f5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d84c66f5 Branch: refs/heads/camel-2.16.x Commit: d84c66f5a4ab6edcb11abbde44f7d3fc4d0dc529 Parents: 2382fd5 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Dec 18 18:10:59 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Dec 18 18:13:14 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/aws/sqs/SqsConsumer.java | 4 +--- .../java/org/apache/camel/component/aws/sqs/SqsProducer.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d84c66f5/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java index 0a8d024..51aa261 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java @@ -242,9 +242,7 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer { protected void processRollback(Exchange exchange) { Exception cause = exchange.getException(); if (cause != null) { - LOG.warn("Exchange failed, so rolling back message status: " + exchange, cause); - } else { - LOG.warn("Exchange failed, so rolling back message status: {}", exchange); + getExceptionHandler().handleException("Error during processing exchange. Will attempt to process the message on next poll.", exchange, cause); } } http://git-wip-us.apache.org/repos/asf/camel/blob/d84c66f5/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java index 69b1eb3..cd16707 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java @@ -66,7 +66,7 @@ public class SqsProducer extends DefaultProducer { private void addDelay(SendMessageRequest request, Exchange exchange) { Integer headerValue = exchange.getIn().getHeader(SqsConstants.DELAY_HEADER, Integer.class); - Integer delayValue = Integer.valueOf(0); + Integer delayValue; if (headerValue == null) { LOG.trace("Using the config delay"); delayValue = getEndpoint().getConfiguration().getDelaySeconds();
