changeset 45336:2be29f802d94

8180949: Correctly handle exception in TCPChannel.createConnection Reviewed-by: rriggs
author robm
date Wed, 24 May 2017 22:07:07 +0100
parents 54c960d82428
children d573a876a6e4
files jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java	Tue May 23 23:25:26 2017 -0700
+++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java	Wed May 24 22:07:07 2017 +0100
@@ -296,16 +296,12 @@
                     out.flush();
                 }
             } catch (IOException e) {
+                try {
+                    conn.close();
+                } catch (Exception ex) {}
                 if (e instanceof RemoteException) {
                     throw (RemoteException) e;
                 } else {
-                    if (conn != null
-                            && e instanceof java.net.SocketTimeoutException)
-                    {
-                        try {
-                            conn.close();
-                        } catch (Exception ex) {}
-                    }
                     throw new ConnectIOException(
                         "error during JRMP connection establishment", e);
                 }