Merge pull request #452 from project-tsurugi/wip/i_811

revise rwlock usage in IpcLink
project-tsurugi · Jun 14, 2024 · 7bea73f · 7bea73f
2 parents c49760c + 707d37f
commit 7bea73f
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/modules/ipc/src/main/java/com/tsurugidb/tsubakuro/channel/ipc/IpcLink.java b/modules/ipc/src/main/java/com/tsurugidb/tsubakuro/channel/ipc/IpcLink.java
@@ -163,15 +163,28 @@ public void remove(ResultSetWireImpl resultSetWire) {
 
     @Override
     public boolean isAlive() {
-        if (closed.get() || (wireHandle == 0)) {
-            return false;
+        rwl.readLock().lock();
+        try {
+            if (closed.get() || (wireHandle == 0)) {
+                return false;
+            }
+            return isAliveNative(wireHandle);
+        } finally {
+            rwl.readLock().unlock();
         }
-        return isAliveNative(wireHandle);
     }
 
     @Override
     public String linkLostMessage() {
-        return isShutdownNative(wireHandle) ? "Session already shutdown" : "IPC connection failure";
+        rwl.readLock().lock();
+        try {
+            if (closed.get() || (wireHandle == 0)) {
+                return "IPC link already closed";
+            }
+            return isShutdownNative(wireHandle) ? "Session already shutdown" : "IPC connection failure";
+        } finally {
+            rwl.readLock().unlock();
+        }
     }
 
     @Override