--- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java	Tue May 23 14:34:45 2017 -0700
+++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java	Wed May 24 17:25:45 2017 +0100
@@ -296,11 +296,19 @@
                     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 {