Changeset: 9f200daffa35 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/9f200daffa35
Modified Files:
src/main/java/org/monetdb/mcl/net/MapiSocket.java
Branch: monetdbs
Log Message:
Ensure sock is closed on errors
diffs (22 lines):
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
+ }
}
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
