# HG changeset patch # User Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> # Date 1704450829 -3600 # Node ID 9f200daffa35a809a06123f7994c36b995f4edc2 # Parent 37a5240e80ef5a9280a7db80dcee4482c79f4bb7 Ensure sock is closed on errors diff --git a/src/main/java/org/monetdb/mcl/net/MapiSocket.java b/src/main/java/org/monetdb/mcl/net/MapiSocket.java --- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java +++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java @@ -376,10 +376,18 @@ public final class MapiSocket { // Only assign to sock when everything went ok so far con = sock; + sock = null; } catch (SSLException e) { throw new MCLException("SSL error: " + e.getMessage(), e); } catch (IOException e) { throw new MCLException("Could not connect to " + tcpHost + ":" + port + ": " + e.getMessage(), e); + } finally { + if (sock != null) + try { + sock.close(); + } catch (IOException e) { + // ignore + } } }