Author: sebb
Date: Sat Jun 11 01:09:00 2016
New Revision: 1747830
URL: http://svn.apache.org/viewvc?rev=1747830&view=rev
Log:
NET-594 TelnetClient._closeOutputStream unhandled exception from
FilterOutputStream.close
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.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=1747830&r1=1747829&r2=1747830&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
01:09:00 2016
@@ -64,6 +64,9 @@ The <action> type attribute can be add,u
<body>
<release version="3.6" date="TBA" description="">
+ <action issue="NET-594" type="fix" dev="sebb" due-to="Brad
Worrral">
+ TelnetClient._closeOutputStream unhandled exception from
FilterOutputStream.close
+ </action>
<action issue="NET-592" type="fix" dev="sebb" due-to="Mark Ford">
plainSocket in FTPSClient is never closed
</action>
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java?rev=1747830&r1=1747829&r2=1747830&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
Sat Jun 11 01:09:00 2016
@@ -117,13 +117,16 @@ public class TelnetClient extends Telnet
@Override
public void disconnect() throws IOException
{
- if (__input != null) {
- __input.close();
+ try {
+ if (__input != null) {
+ __input.close();
+ }
+ if (__output != null) {
+ __output.close();
+ }
+ } finally { // NET-594
+ super.disconnect();
}
- if (__output != null) {
- __output.close();
- }
- super.disconnect();
}
/***
