You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/09/17 17:54:58 UTC
svn commit: r1386674 - in /camel/branches/camel-2.10.x: ./
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/
Author: davsclaus
Date: Mon Sep 17 15:54:57 2012
New Revision: 1386674
URL: http://svn.apache.org/viewvc?rev=1386674&view=rev
Log:
CAMEL-5605: Fixed ftp read lock changed strategy when recusrive. Thanks to Jury M. for the patch.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1386671
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java?rev=1386674&r1=1386673&r2=1386674&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java Mon Sep 17 15:54:57 2012
@@ -75,7 +75,7 @@ public class FtpChangedExclusiveReadLock
}
LOG.trace("List files {} found {} files", file.getAbsoluteFilePath(), files.size());
for (FTPFile f : files) {
- if (f.getName().equals(file.getFileName())) {
+ if (f.getName().equals(file.getFileNameOnly())) {
newLastModified = f.getTimestamp().getTimeInMillis();
newLength = f.getSize();
}
Modified: camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java?rev=1386674&r1=1386673&r2=1386674&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java Mon Sep 17 15:54:57 2012
@@ -76,7 +76,7 @@ public class SftpChangedExclusiveReadLoc
}
LOG.trace("List files {} found {} files", file.getAbsoluteFilePath(), files.size());
for (ChannelSftp.LsEntry f : files) {
- if (f.getFilename().equals(file.getFileName())) {
+ if (f.getFilename().equals(file.getFileNameOnly())) {
newLastModified = f.getAttrs().getMTime();
newLength = f.getAttrs().getSize();
}