Updated Branches: refs/heads/camel-2.12.x c948c2b8d -> 93176a323 refs/heads/master d99d5940d -> e92a69c23
CAMEL-6671: FTP consumer. Added useList and ignoreFileNotFound options to allow to download a single file without using FTP LIST command which is needed in some use-cases, such as user has no permission to do FTP LIST. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ab6909f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ab6909f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ab6909f Branch: refs/heads/camel-2.12.x Commit: 8ab6909f6146c96cf192cf8ba44f82a79d9ab92c Parents: c948c2b Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Sep 5 13:06:58 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 5 13:07:16 2013 +0200 ---------------------------------------------------------------------- .../apache/camel/component/file/GenericFileConsumer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8ab6909f/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java index c55755e..3a3fc59 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java @@ -201,7 +201,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum started = processExchange(exchange); } - // if we did not start process the file then decremember the counter + // if we did not start process the file then decrement the counter if (!started) { answer--; } @@ -213,6 +213,12 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum return answer; } + /** + * Drain any in progress files as we are done with this batch + * + * @param exchanges the exchanges + * @param limit the limit + */ protected void removeExcessiveInProgressFiles(Deque<Exchange> exchanges, int limit) { // remove the file from the in progress list in case the batch was limited by max messages per poll while (exchanges.size() > limit) { @@ -224,7 +230,6 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum } } - /** * Whether or not we can continue polling for more files *
