From f71bc2da0b24818c35b5e98ac3557d105a39bf65 Mon Sep 17 00:00:00 2001
From: robm <unknown>
Date: Wed, 24 May 2017 22:07:07 +0100
Subject: [PATCH] 8180949: Correctly handle exception in
 TCPChannel.createConnection Reviewed-by: rriggs

---
 .../classes/sun/rmi/transport/tcp/TCPChannel.java      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java b/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
index 018a1ef5a..c5180244b 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);
                 }
-- 
GitLab