Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 32A55DCE2 for ; Fri, 25 Jan 2013 08:49:46 +0000 (UTC) Received: (qmail 10267 invoked by uid 500); 25 Jan 2013 08:49:46 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 10143 invoked by uid 500); 25 Jan 2013 08:49:44 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 10119 invoked by uid 99); 25 Jan 2013 08:49:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2013 08:49:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2013 08:49:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 163522388980; Fri, 25 Jan 2013 08:49:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130125084923.163522388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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()) {