camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1438388 - in /camel/branches/camel-2.9.x: ./ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Date Fri, 25 Jan 2013 08:49:22 GMT
Author: davsclaus
Date: Fri Jan 25 08:49:22 2013
New Revision: 1438388

URL: http://svn.apache.org/viewvc?rev=1438388&view=rev
Log:
CAMEL-5792: Fixed the regression by SftpProducerFileWithPathNoStepwiseTest.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1424437
  Merged /camel/branches/camel-2.10.x:r1424439

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1438388&r1=1438387&r2=1438388&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Fri Jan 25 08:49:22 2013
@@ -384,8 +384,9 @@ public class SftpOperations implements R
             return;
         }
 
-        // must compact path so FTP server can traverse correctly
-        path = FileUtil.compactPath(path);
+        // must compact path so SFTP server can traverse correctly, make use of the '/'
+        // separator because JSch expects this as the file separator even on Windows
+        path = FileUtil.compactPath(path, '/');
 
         // not stepwise should change directory in one operation
         if (!endpoint.getConfiguration().isStepwise()) {



Mime
View raw message