CAMEL-7525: Added readLockMarkerFile to allow end users to turn it off for changed/rename read locks.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/693d289e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/693d289e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/693d289e Branch: refs/heads/master Commit: 693d289e83df819942fe418f8d72c8e1b7a332f6 Parents: cbc732a Author: Claus Ibsen <[email protected]> Authored: Fri Jul 4 14:59:45 2014 +0200 Committer: Claus Ibsen <[email protected]> Committed: Fri Jul 4 14:59:45 2014 +0200 ---------------------------------------------------------------------- .../remote/strategy/FtpChangedExclusiveReadLockStrategy.java | 5 +++++ .../file/remote/strategy/FtpProcessStrategyFactory.java | 8 ++++++++ .../strategy/SftpChangedExclusiveReadLockStrategy.java | 5 +++++ 3 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/693d289e/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java index 3169f18..fdbf457 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java @@ -148,6 +148,11 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive this.readLockLoggingLevel = readLockLoggingLevel; } + @Override + public void setMarkerFiler(boolean markerFiler) { + // noop - not supported by ftp + } + public long getMinLength() { return minLength; } http://git-wip-us.apache.org/repos/asf/camel/blob/693d289e/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java index 4e89c19..ac0977e 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java @@ -111,6 +111,10 @@ public final class FtpProcessStrategyFactory { if (checkInterval != null) { readLockStrategy.setCheckInterval(checkInterval); } + Boolean readLockMarkerFile = (Boolean) params.get("readLockMarkerFile"); + if (readLockMarkerFile != null) { + readLockStrategy.setMarkerFiler(readLockMarkerFile); + } return readLockStrategy; } else if ("changed".equals(readLock)) { FtpChangedExclusiveReadLockStrategy readLockStrategy = new FtpChangedExclusiveReadLockStrategy(); @@ -130,6 +134,10 @@ public final class FtpProcessStrategyFactory { if (fastExistsCheck != null) { readLockStrategy.setFastExistsCheck(fastExistsCheck); } + Boolean readLockMarkerFile = (Boolean) params.get("readLockMarkerFile"); + if (readLockMarkerFile != null) { + readLockStrategy.setMarkerFiler(readLockMarkerFile); + } return readLockStrategy; } } http://git-wip-us.apache.org/repos/asf/camel/blob/693d289e/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java index 3843f1d..715b3e6 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java @@ -161,4 +161,9 @@ public class SftpChangedExclusiveReadLockStrategy implements GenericFileExclusiv public void setFastExistsCheck(boolean fastExistsCheck) { this.fastExistsCheck = fastExistsCheck; } + + @Override + public void setMarkerFiler(boolean markerFiler) { + // noop - not supported by ftp + } } \ No newline at end of file
