src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPChannel.java

*** 294,313 ****
                      }
  
                      out.flush();
                  }
              } catch (IOException e) {
-                 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);
                  }
              }
          } else {
--- 294,309 ----
                      }
  
                      out.flush();
                  }
              } catch (IOException e) {
                  try {
                      conn.close();
                  } catch (Exception ex) {}
!                 if (e instanceof RemoteException) {
!                     throw (RemoteException) e;
!                 } else {
                      throw new ConnectIOException(
                          "error during JRMP connection establishment", e);
                  }
              }
          } else {