disconnect IPC connection at IpcLink.closeNative()

project-tsurugi · Sep 1, 2023 · e18d0f7 · e18d0f7
1 parent b5aea9c
commit e18d0f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/modules/ipc/src/main/native/include/udf_wires.h b/modules/ipc/src/main/native/include/udf_wires.h
@@ -155,9 +155,7 @@ class session_wire_container
         }
     }
 
-    ~session_wire_container() {
-        request_wire_.disconnect();
-    }
+    ~session_wire_container() = default;
 
     bool is_deletable() {
         std::lock_guard<std::mutex> lock(mtx_set_);

diff --git a/modules/ipc/src/main/native/src/wireJNI.cpp b/modules/ipc/src/main/native/src/wireJNI.cpp
@@ -161,6 +161,7 @@ JNIEXPORT void JNICALL Java_com_tsurugidb_tsubakuro_channel_ipc_IpcLink_closeNat
     session_wire_container* swc = reinterpret_cast<session_wire_container*>(static_cast<std::uintptr_t>(handle));
 
     if (swc != nullptr) {
+        swc->get_request_wire().disconnect();
         swc->get_response_wire().close();
     }
 }