IGNITE-20740 Fix SocketChannel leak when connection fails (#11016)

Co-authored-by: Pavel Tupitsyn <[email protected]>
apache · Oct 30, 2023 · eb57f7d · eb57f7d
1 parent 63f1a80
commit eb57f7d
Showing 1 changed file with 25 additions and 2 deletions.
diff --git a/...ache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java b/...ache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
@@ -146,8 +146,31 @@ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
         rwLock.readLock().lock();
 
         try {
-            SocketChannel ch = SocketChannel.open();
-            ch.socket().connect(new InetSocketAddress(addr.getHostName(), addr.getPort()), connTimeout);
+            SocketChannel ch = null;
+            try {
+                ch = SocketChannel.open();
+                ch.socket().connect(new InetSocketAddress(addr.getHostName(), addr.getPort()), connTimeout);
+            }
+            catch (Exception e) {
+                if (ch != null) {
+                    if (ch.socket() != null) {
+                        try {
+                            ch.socket().close();
+                        }
+                        catch (Exception ignored) {
+                            // ignore close exception
+                        }
+                    }
+
+                    try {
+                        ch.close();
+                    }
+                    catch (Exception ignored) {
+                        // ignore close exception
+                    }
+                }
+                throw new ClientConnectionException(e.getMessage(), e);
+            }
 
             Map<Integer, Object> meta = new HashMap<>();
             GridNioFuture<?> sslHandshakeFut = null;