Repository: camel Updated Branches: refs/heads/master 5d8a4b045 -> bb38c204e
CAMEL-8421: Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb38c204 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb38c204 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb38c204 Branch: refs/heads/master Commit: bb38c204e125fea9b1c69b421bc584fc5daaf748 Parents: 5d8a4b0 Author: Claus Ibsen <[email protected]> Authored: Wed Mar 4 08:33:58 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Wed Mar 4 08:33:58 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/file/GenericFileEndpoint.java | 2 +- .../file/strategy/FileChangedExclusiveReadLockStrategy.java | 2 +- .../file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java | 2 +- .../component/file/strategy/FileChangedReadLockMinAgeTest.java | 2 +- .../file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java | 2 +- .../file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bb38c204/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java index 797fe40..a6b6200 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java @@ -166,7 +166,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple @UriParam(label = "consumer", defaultValue = "1") protected long readLockMinLength = 1; @UriParam(label = "consumer", defaultValue = "0") - protected long readLockMinAge = 0; + protected long readLockMinAge; @UriParam(label = "consumer") protected GenericFileExclusiveReadLockStrategy<T> exclusiveReadLockStrategy; http://git-wip-us.apache.org/repos/asf/camel/blob/bb38c204/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java index bfaf3da..c64e21a 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java @@ -39,7 +39,7 @@ public class FileChangedExclusiveReadLockStrategy extends MarkerFileExclusiveRea private long timeout; private long checkInterval = 1000; private long minLength = 1; - private long minAge = 0; + private long minAge; private LoggingLevel readLockLoggingLevel = LoggingLevel.WARN; @Override http://git-wip-us.apache.org/repos/asf/camel/blob/bb38c204/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java b/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java index 3ab312a..524452d 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java @@ -47,7 +47,7 @@ public class FileChangedReadLockMinAgeShortCircuitTest extends ContextTestSuppor mock.expectedMessageCount(1); mock.expectedFileExists("target/changed/out/file.dat"); // We should get the file on the first poll - mock.expectedMessagesMatches(property(Exchange.RECEIVED_TIMESTAMP).convertTo(long.class).isLessThan(new Date().getTime()+15000)); + mock.expectedMessagesMatches(property(Exchange.RECEIVED_TIMESTAMP).convertTo(long.class).isLessThan(new Date().getTime() + 15000)); assertMockEndpointsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/bb38c204/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeTest.java b/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeTest.java index f73d100..c0690fc 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockMinAgeTest.java @@ -46,7 +46,7 @@ public class FileChangedReadLockMinAgeTest extends ContextTestSupport { mock.expectedMessageCount(1); mock.expectedFileExists("target/changed/out/slowfile.dat"); // writing takes ~2 seconds, and then it has to age for at least minAge milliseconds (3 seconds) - mock.expectedMessagesMatches(property(Exchange.RECEIVED_TIMESTAMP).convertTo(long.class).isGreaterThan(new Date().getTime()+5000)); + mock.expectedMessagesMatches(property(Exchange.RECEIVED_TIMESTAMP).convertTo(long.class).isGreaterThan(new Date().getTime() + 5000)); writeSlowFile(); http://git-wip-us.apache.org/repos/asf/camel/blob/bb38c204/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 fb1b850..9fd31ab 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 @@ -37,7 +37,7 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive private long checkInterval = 5000; private LoggingLevel readLockLoggingLevel = LoggingLevel.WARN; private long minLength = 1; - private long minAge = 0; + private long minAge; private boolean fastExistsCheck; @Override http://git-wip-us.apache.org/repos/asf/camel/blob/bb38c204/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 8100811..de65962 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 @@ -37,7 +37,7 @@ public class SftpChangedExclusiveReadLockStrategy implements GenericFileExclusiv private long checkInterval = 5000; private LoggingLevel readLockLoggingLevel = LoggingLevel.WARN; private long minLength = 1; - private long minAge = 0; + private long minAge; private boolean fastExistsCheck; @Override
