Repository: camel Updated Branches: refs/heads/master a13b34925 -> 50dc4ea14
CAMEL-10340: Adjusted deleteIfFiltered behavior for aws-sqs component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50dc4ea1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50dc4ea1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50dc4ea1 Branch: refs/heads/master Commit: 50dc4ea14c0ad6d3d93cfe4ddb386a006d1fafcc Parents: a13b3492 Author: Mike Yan <y...@talend.com> Authored: Fri Sep 30 19:13:44 2016 +0800 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Sep 30 13:48:41 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/aws/sqs/SqsConsumer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/50dc4ea1/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 7f646f0..c34035d 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 @@ -243,10 +243,12 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer { } private boolean shouldDelete(Exchange exchange) { + boolean shouldDeleteByFilter = exchange.getProperty(Exchange.FILTER_MATCHED) != null + && getConfiguration().isDeleteIfFiltered() + && passedThroughFilter(exchange); + return getConfiguration().isDeleteAfterRead() - && (getConfiguration().isDeleteIfFiltered() - || (!getConfiguration().isDeleteIfFiltered() - && passedThroughFilter(exchange))); + || shouldDeleteByFilter; } private boolean passedThroughFilter(Exchange exchange) {
