apply comments (2nd)

project-tsurugi · Apr 26, 2024 · bc36eaf · bc36eaf
1 parent 176d6c0
commit bc36eaf
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/...main/java/com/tsurugidb/tsubakuro/channel/common/connection/BackgroundFutureResponse.java b/...main/java/com/tsurugidb/tsubakuro/channel/common/connection/BackgroundFutureResponse.java
@@ -117,13 +117,23 @@ public void setCloseTimeout(@Nullable Timeout timeout) {
     public synchronized void close() throws IOException, ServerException, InterruptedException {
         try {
             if (!gotton.get()) {
-                var obj = get();
-                if (obj instanceof ServerResource) {
-                    var sr = (ServerResource) obj;
-                    if (closeTimeout != null) {
-                        sr.setCloseTimeout(closeTimeout);
+                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) {
+                        throw new IOException(e);
+                    }
+                } else {
+                    var obj = get();
+                    if (obj instanceof ServerResource) {
+                        var sr = (ServerResource) obj;
+                        sr.close();
                     }
-                    sr.close();
                 }
             }
         } finally {

diff --git a/...main/java/com/tsurugidb/tsubakuro/channel/common/connection/ForegroundFutureResponse.java b/...main/java/com/tsurugidb/tsubakuro/channel/common/connection/ForegroundFutureResponse.java
@@ -151,13 +151,23 @@ public void setCloseTimeout(@Nullable Timeout timeout) {
     public synchronized void close() throws IOException, ServerException, InterruptedException {
         try {
             if (!gotton.getAndSet(true)) {
-                var obj = get();
-                if (obj instanceof ServerResource) {
-                    var sr = (ServerResource) obj;
-                    if (closeTimeout != null) {
-                        sr.setCloseTimeout(closeTimeout);
+                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) {
+                        throw new IOException(e);
+                    }
+                } else {
+                    var obj = get();
+                    if (obj instanceof ServerResource) {
+                        var sr = (ServerResource) obj;
+                        sr.close();
                     }
-                    sr.close();
                 }
             }
         } finally {