1 files changed, 44 insertions, 1 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 10c9b8a25f7..659995acc2a 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -692,6 +692,28 @@ public class BasicStream
         }
     }
 
+    public void
+    writeSerializable(java.io.Serializable o)
+    {
+        if(o == null)
+        {
+            writeSize(0);
+            return;
+        }
+        try
+        {
+            OutputStreamWrapper w = new OutputStreamWrapper(this);
+            java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(w);
+            out.writeObject(o);
+            out.close();
+            w.close();
+        }
+        catch(java.lang.Exception ex)
+        {
+            throw new Ice.MarshalException("cannot serialize object: " + ex);
+        }
+    }
+
     public byte
     readByte()
     {
@@ -733,6 +755,27 @@ public class BasicStream
         }
     }
 
+    public java.io.Serializable
+    readSerializable()
+    {
+        int sz = readSize();
+        if (sz == 0)
+        {
+            return null;
+        }
+        checkFixedSeq(sz, 1);
+        try
+        {
+            InputStreamWrapper w = new InputStreamWrapper(sz, this);
+            java.io.ObjectInputStream in = new java.io.ObjectInputStream(w);
+            return (java.io.Serializable)in.readObject();
+        }
+        catch(java.lang.Exception ex)
+        {
+            throw new Ice.MarshalException("cannot deserialize object: " + ex);
+        }
+    }
+
     public void
     writeBool(boolean v)
     {
@@ -2056,7 +2099,7 @@ public class BasicStream
         return ucStream;
     }
 
-    private void
+    public void
     expand(int n)
     {
         if(!_unlimited && _buf.b != null && _buf.b.position() + n > _messageSizeMax)