diff -r 54c960d82428 -r 2be29f802d94 jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java
--- 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);
                 }