| commit | 96e16497119db404a4e59709e022d4f9564d23e6 | [log] [tgz] |
|---|---|---|
| author | Sebastian Bazley <sebb@apache.org> | Sat Jun 11 00:57:57 2016 +0000 |
| committer | Sebastian Bazley <sebb@apache.org> | Sat Jun 11 00:57:57 2016 +0000 |
| tree | 7b26cf58b0874268df6eefc6c972c6b19d4ca8c9 | |
| parent | 328c4046d88629d1d7d484e88cb4293541bc1141 [diff] |
NET-592 plainSocket in FTPSClient is never closed git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1747829 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 6416ac0..0ca0f59 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml
@@ -63,6 +63,11 @@ --> <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.
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java index 71c0ec2..a0f8b63 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -747,6 +747,9 @@ public void disconnect() throws IOException { super.disconnect(); + if (plainSocket != null) { + plainSocket.close(); + } setSocketFactory(null); setServerSocketFactory(null); }