diff --git a/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java b/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
index 018a1ef5a8c512475a78ded203de2d3eb257557a..c5180244beb0ce60b2c4d63afbc590f8ed36e4e5 100644
--- a/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
+++ b/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
@@ -298,16 +298,12 @@ public class TCPChannel implements Channel {
                     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);
                 }