Repository: camel Updated Branches: refs/heads/camel-2.17.x 7dcdb0a7c -> 88c84e599
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/99523d0e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99523d0e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99523d0e Branch: refs/heads/camel-2.17.x Commit: 99523d0e0e8158f2547aabd05fd3195993ded5f0 Parents: 7dcdb0a Author: Mike Yan <[email protected]> Authored: Fri Sep 30 19:13:44 2016 +0800 Committer: Andrea Cosentino <[email protected]> Committed: Fri Sep 30 13:49:52 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/99523d0e/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 0a0904e..57076b1 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) {
