Merge pull request #35 from sbesson/omerorequest_joinsession_resource…

…_leak OmeroRequest: close resources on client.joinSession() failure
glencoesoftware · Feb 13, 2025 · 643c0e3 · 643c0e3
2 parents abdd5d3 + 32dc06e
commit 643c0e3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/com/glencoesoftware/omero/ms/core/OmeroRequest.java b/src/main/java/com/glencoesoftware/omero/ms/core/OmeroRequest.java
@@ -92,6 +92,11 @@ public OmeroRequest(String host, int port, String omeroSessionKey)
         try {
             client.joinSession(omeroSessionKey).detachOnDestroy();
             log.debug("Successfully joined session: {}", omeroSessionKey);
+        } catch (Exception e) {
+            span.error(e);
+            log.debug("Failed to join session: {}", omeroSessionKey);
+            client.closeSession();
+            throw e;
         } finally {
             span.finish();
         }