Author: ggregory
Date: Wed May 16 17:25:51 2012
New Revision: 1339271
URL: http://svn.apache.org/viewvc?rev=1339271&view=rev
Log:
[VFS-353][FTP] Client should call logout before disconnecting.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java?rev=1339271&r1=1339270&r2=1339271&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FTPClientWrapper.java
Wed May 16 17:25:51 2012
@@ -101,11 +101,16 @@ class FTPClientWrapper implements FtpCli
{
try
{
- getFtpClient().disconnect();
- }
- finally
+ getFtpClient().quit();
+ } finally
{
- ftpClient = null;
+ try
+ {
+ getFtpClient().disconnect();
+ } finally
+ {
+ ftpClient = null;
+ }
}
}
@@ -120,7 +125,6 @@ class FTPClientWrapper implements FtpCli
catch (IOException e)
{
disconnect();
-
FTPFile[] files = listFilesInDirectory(relPath);
return files;
}
@@ -246,7 +250,6 @@ class FTPClientWrapper implements FtpCli
catch (IOException e)
{
disconnect();
-
FTPClient client = getFtpClient();
client.setRestartOffset(restartOffset);
return client.retrieveFileStream(relPath);
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1339271&r1=1339270&r2=1339271&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Wed May 16 17:25:51 2012
@@ -23,6 +23,9 @@
<body>
<release version="2.1" date="TBD" description="">
+ <action issue="VFS-353" dev="ggregory" type="update" due-to="bergander">
+ [FTP] Client should call logout before disconnecting.
+ </action>
<action issue="VFS-408" dev="ggregory" type="update"
due-to="[email protected]">
CompressedFileFileObject Exception thrown when container file has no
extension.
</action>
