Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 35473 invoked from network); 3 Nov 2009 01:44:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Nov 2009 01:44:23 -0000 Received: (qmail 22507 invoked by uid 500); 3 Nov 2009 01:44:22 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 22432 invoked by uid 500); 3 Nov 2009 01:44:22 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 22415 invoked by uid 99); 3 Nov 2009 01:44:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2009 01:44:21 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 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; Tue, 03 Nov 2009 01:44:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5241223888EA; Tue, 3 Nov 2009 01:43:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832254 - in /commons/proper/vfs/trunk: core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java xdocs/changes.xml Date: Tue, 03 Nov 2009 01:43:59 -0000 To: commits@commons.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091103014359.5241223888EA@eris.apache.org> Author: rgoers Date: Tue Nov 3 01:43:58 2009 New Revision: 832254 URL: http://svn.apache.org/viewvc?rev=832254&view=rev Log: Apply patch for VFS-286 provided by Kirill Safonov Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java commons/proper/vfs/trunk/xdocs/changes.xml Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java?rev=832254&r1=832253&r2=832254&view=diff ============================================================================== --- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java (original) +++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpFileObject.java Tue Nov 3 01:43:58 2009 @@ -301,7 +301,25 @@ return null; } - vector = channel.ls("."); + try + { + vector = channel.ls("."); + } + catch (SftpException e) + { + try + { + if (relPath != null) + { + channel.cd(workingDirectory); + } + } + catch (SftpException e2) + { + throw e; + } + throw e; + } try { Modified: commons/proper/vfs/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/xdocs/changes.xml?rev=832254&r1=832253&r2=832254&view=diff ============================================================================== --- commons/proper/vfs/trunk/xdocs/changes.xml (original) +++ commons/proper/vfs/trunk/xdocs/changes.xml Tue Nov 3 01:43:58 2009 @@ -23,6 +23,11 @@ + + SftpFileObject.doListChildrenResolved() changes the working dir before doing ChannelSftp.ls() call. + If ls() throws an exception, the current directory is not reset. All the subsequent operations that rely on the + current dir will fail trying to change into nonexistent directory. + Rename HttpRandomAccesContent to HttpRandomAccessContent.