hessian: black-box writeReplace fix && resin-admin cloud /threads pag…

…e fix git-svn-id: svn://svn.caucho.com/resin/trunk/modules/hessian@9170 9c94448d-38f1-0310-a231-d98308ff1ebf
ebourg · Apr 17, 2012 · 42caa81 · 42caa81
1 parent fa41274
commit 42caa81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/com/caucho/hessian/io/JavaSerializer.java b/src/com/caucho/hessian/io/JavaSerializer.java
@@ -210,9 +210,25 @@ public void writeObject(Object obj, AbstractHessianOutput out)
 
         // out.removeRef(obj);
 
+        /*
         out.writeObject(repl);
 
         out.replaceRef(repl, obj);
+        */
+
+        //hessian/3a5a
+        int ref = out.writeObjectBegin(cl.getName());
+
+        if (ref < -1) {
+          writeObject10(repl, out);
+        } else {
+          if (ref == -1) {
+            writeDefinition20(out);
+            out.writeObjectBegin(cl.getName());
+          }
+
+          writeInstance(repl, out);
+        }
 
         return;
       }

diff --git a/src/com/caucho/hessian/io/WriteReplaceSerializer.java b/src/com/caucho/hessian/io/WriteReplaceSerializer.java
@@ -166,6 +166,7 @@ public void writeObject(Object obj, AbstractHessianOutput out)
         }
 
         _baseSerializer.writeObject(obj, out);
+
         return;
       }