1 files changed, 15 insertions, 0 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 20a4ea56bbe..50b96d75c22 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -244,6 +244,21 @@ public class BasicStream
     public void
     endReadEncaps()
     {
+	checkReadEncaps();
+        final ReadEncaps curr = _readEncapsStack;
+        assert(curr != null);
+        _readEncapsStack = curr.next;
+        curr.next = _readEncapsCache;
+        _readEncapsCache = curr;
+        if(_readEncapsCache.objectsRead != null)
+        {
+            _readEncapsCache.objectsRead.clear();
+        }
+    }
+
+    public void
+    skipReadEncaps()
+    {
         final ReadEncaps curr = _readEncapsStack;
         assert(curr != null);
         final int start = curr.start;