Mercurial > hg > monetdb-java

changeset 850:9f200daffa35 monetdbs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure sock is closed on errors
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Fri, 05 Jan 2024 11:33:49 +0100 (15 months ago)
parents 37a5240e80ef
children 157dcb2d6516
files src/main/java/org/monetdb/mcl/net/MapiSocket.java
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
+				}
 		}
 	}