Fix spurious IllegalStateException.

cojen · Feb 1, 2025 · f03ac7c · f03ac7c
1 parent f52e12c
commit f03ac7c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/org/cojen/dirmi/core/AutoDisposer.java b/src/main/java/org/cojen/dirmi/core/AutoDisposer.java
@@ -114,7 +114,7 @@ public BasicRef(StubWrapper wrapper, StubInvoker invoker) {
         }
 
         void removed() {
-            if (mInvoker.support().session() instanceof CoreSession session) {
+            if (mInvoker.support().trySession() instanceof CoreSession session) {
                 // Note: Although the pipe isn't flushed immediately, this operation might
                 // still block. If it does, then no dispose messages will be sent for any
                 // sessions until the blocked one automatically disconnects. This can be

diff --git a/src/main/java/org/cojen/dirmi/core/DisposedStubSupport.java b/src/main/java/org/cojen/dirmi/core/DisposedStubSupport.java
@@ -81,6 +81,11 @@ public CoreSession<?> session() {
         return mSession;
     }
 
+    @Override
+    public CoreSession<?> trySession() {
+        return mSession;
+    }
+
     @Override
     public boolean isLenientRestorable() {
         return mSession != null && mRestorable;

diff --git a/src/main/java/org/cojen/dirmi/core/StubSupport.java b/src/main/java/org/cojen/dirmi/core/StubSupport.java
@@ -30,6 +30,13 @@
 public interface StubSupport {
     Session session();
 
+    /**
+     * @return null if disposed
+     */
+    default Session trySession() {
+        return session();
+    }
+
     public default boolean isLenientRestorable() {
         return false;
     }