Eagerly disable reference mode when writing stubs and skeletons.

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

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/cojen/dirmi/core/BufferedPipe.java b/src/main/java/org/cojen/dirmi/core/BufferedPipe.java
@@ -2383,6 +2383,17 @@ private boolean tryWriteReference(ReferenceMap refMap, Object v) throws IOExcept
         }
     }
 
+    /**
+     * If necessary, writes T_REF_MODE_OFF before writing an object.
+     */
+    protected void refModeOffIfDisabled() throws IOException {
+        ReferenceMap refMap = mOutRefMap;
+        if (refMap != null && refMap.isDisabled()) {
+            write(T_REF_MODE_OFF);
+            mOutRefMap = null;
+        }
+    }
+
     @Override
     public final SocketAddress localAddress() {
         return mLocalAddress;

diff --git a/src/main/java/org/cojen/dirmi/core/CorePipe.java b/src/main/java/org/cojen/dirmi/core/CorePipe.java
@@ -89,6 +89,7 @@ Class<?> loadClass(String name) throws ClassNotFoundException {
 
     @Override
     void writeStub(Stub stub) throws IOException {
+        refModeOffIfDisabled();
         requireOutput(9);
         int end = mOutEnd;
         byte[] buf = mOutBuffer;
@@ -106,6 +107,7 @@ void writeSkeleton(Object server) throws IOException {
      * @param typeCode T_REMOTE_T or T_REMOTE_TI
      */
     void writeSkeletonHeader(byte typeCode, Skeleton skeleton) throws IOException {
+        refModeOffIfDisabled();
         requireOutput(17);
         int end = mOutEnd;
         byte[] buf = mOutBuffer;