camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1386671 - in /camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy: FtpChangedExclusiveReadLockStrategy.java SftpChangedExclusiveReadLockStrategy.java
Date Mon, 17 Sep 2012 15:51:58 GMT
Author: davsclaus
Date: Mon Sep 17 15:51:58 2012
New Revision: 1386671

URL: http://svn.apache.org/viewvc?rev=1386671&view=rev
Log:
CAMEL-5605: Fixed ftp read lock changed strategy when recusrive. Thanks to Jury M. for the
patch.

Modified:
    camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
    camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java

Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java?rev=1386671&r1=1386670&r2=1386671&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
(original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
Mon Sep 17 15:51:58 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/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java?rev=1386671&r1=1386670&r2=1386671&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
(original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
Mon Sep 17 15:51:58 2012
@@ -75,7 +75,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();
                 }



Mime
View raw message