apply comments (5th)

project-tsurugi · May 10, 2024 · 9e798f9 · 9e798f9
1 parent cc4aa4b
commit 9e798f9
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/...main/java/com/tsurugidb/tsubakuro/channel/common/connection/ForegroundFutureResponse.java b/...main/java/com/tsurugidb/tsubakuro/channel/common/connection/ForegroundFutureResponse.java
@@ -152,16 +152,11 @@ public synchronized void close() throws IOException, ServerException, Interrupte
         try {
             if (!gotton.getAndSet(true)) {
                 if (closeTimeout != null) {
-                    try {
-                        var obj = get(closeTimeout.value(), closeTimeout.unit());
-                        if (obj instanceof ServerResource) {
-                            var sr = (ServerResource) obj;
-                            sr.setCloseTimeout(closeTimeout);
-                            sr.close();
-                        }
-                    } catch (TimeoutException e) {
-                        exception = new ResponseTimeoutException(e);
-                        throw (ResponseTimeoutException) exception;
+                    var obj = get(closeTimeout.value(), closeTimeout.unit());
+                    if (obj instanceof ServerResource) {
+                        var sr = (ServerResource) obj;
+                        sr.setCloseTimeout(closeTimeout);
+                        sr.close();
                     }
                 } else {
                     var obj = get();
@@ -170,34 +165,39 @@ public synchronized void close() throws IOException, ServerException, Interrupte
                         sr.close();
                     }
                 }
-            }
+            } 
+        } catch (TimeoutException e) {
+            exception = new ResponseTimeoutException(e);
+        } catch (Exception e) {
+            exception = e;
         } finally {
             try {
                 var up = unprocessed.getAndSet(null);
                 if (closeTimeout != null && up != null) {
                     up.setCloseTimeout(closeTimeout);
                 }
                 Owner.close(up);
-            } catch (IOException | ServerException | InterruptedException e) {
+            } catch (Exception e) {
                 if (exception == null) {
                     exception = e;
                 } else {
                     exception.addSuppressed(e);
                 }
-                throwException(exception);
             } finally {
                 try {
                     if (closeTimeout != null) {
                         delegate.setCloseTimeout(closeTimeout);
                     }
                     delegate.close();
                     closed.set(true);
-                } catch (IOException | ServerException | InterruptedException e) {
+                } catch (Exception e) {
                     if (exception == null) {
                         exception = e;
                     } else {
                         exception.addSuppressed(e);
                     }
+                }
+                if (exception != null) {
                     throwException(exception);
                 }
             }