You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/06/11 00:57:57 UTC
svn commit: r1747829 - in /commons/proper/net/trunk/src: changes/changes.xml
main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: sebb
Date: Sat Jun 11 00:57:57 2016
New Revision: 1747829
URL: http://svn.apache.org/viewvc?rev=1747829&view=rev
Log:
NET-592 plainSocket in FTPSClient is never closed
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1747829&r1=1747828&r2=1747829&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Sat Jun 11 00:57:57 2016
@@ -63,6 +63,11 @@ The <action> type attribute can be add,u
-->
<body>
+ <release version="3.6" date="TBA" description="">
+ <action issue="NET-592" type="fix" dev="sebb" due-to="Mark Ford">
+ plainSocket in FTPSClient is never closed
+ </action>
+ </release>
<release version="3.5" date="2016-05-05" description="
This is mainly a bug-fix release. See further details below.
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=1747829&r1=1747828&r2=1747829&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java Sat Jun 11 00:57:57 2016
@@ -747,6 +747,9 @@ public class FTPSClient extends FTPClien
public void disconnect() throws IOException
{
super.disconnect();
+ if (plainSocket != null) {
+ plainSocket.close();
+ }
setSocketFactory(null);
setServerSocketFactory(null);
}