stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8175131: sun.rmi.transport.tcp.TCPChannel.createConnection close connection on timeout

Browse Source 
Reviewed-by: rriggs, msheppar
This commit is contained in:
Rob McKenna 2017-05-24 17:25:45 +01:00
parent 538f99f6ca
commit 2f402211d9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
View File

@ -296,11 +296,19 @@ public class TCPChannel implements Channel {
out.flush();
}
} catch (IOException e) {
if (e instanceof RemoteException)
if (e instanceof RemoteException) {
throw (RemoteException) e;
else
} else {
if (conn != null
&& e instanceof java.net.SocketTimeoutException)
{
try {
conn.close();
} catch (Exception ex) {}
}
throw new ConnectIOException(
"error during JRMP connection establishment", e);
}
}
} else {
try {