Author: bvahdat
Date: Thu Dec 20 12:49:23 2012
New Revision: 1424439
URL: http://svn.apache.org/viewvc?rev=1424439&view=rev
Log:
Merged revisions 1424437 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1424437 | bvahdat | 2012-12-20 13:45:16 +0100 (Do, 20 Dez 2012) | 1 line
CAMEL-5792: Fixed the regression by SftpProducerFileWithPathNoStepwiseTest.
........
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/SftpOperations.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1424437
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/SftpOperations.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/SftpOperations.java?rev=1424439&r1=1424438&r2=1424439&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
Thu Dec 20 12:49:23 2012
@@ -383,8 +383,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()) {
