[enhancement/improveclose] Improved code inside close to have less ne…

…sting
Together-Java · Aug 4, 2024 · 8dd74cb · 8dd74cb
1 parent b1a3d5f
commit 8dd74cb
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java b/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java
@@ -222,18 +222,19 @@ public String id() {
     }
 
     public void close() {
-        LOGGER.debug("Close called for session {}.", id);
         try {
-            try {
-                writer.close();
-            } finally {
-                try {
-                    reader.close();
-                } finally {
-                    if(!dockerService.isDead(containerName())) {
-                        dockerService.killContainerByName(containerName());
-                    }
-                }
+            writer.close();
+        } catch (Exception ex) {
+            LOGGER.error("Unexpected error while closing.", ex);
+        }
+        try {
+            reader.close();
+        } catch (Exception ex) {
+            LOGGER.error("Unexpected error while closing.", ex);
+        }
+        try {
+            if(!dockerService.isDead(containerName())) {
+                dockerService.killContainerByName(containerName());
             }
         } catch (Exception ex) {
             LOGGER.error("Unexpected error while closing.", ex);