1 files changed, 15 insertions, 0 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 305a43d33a5..d564ab96994 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -141,6 +141,21 @@ IceInternal::BasicStream::startReadEncaps()
 void
 IceInternal::BasicStream::endReadEncaps()
 {
+    checkReadEncaps();
+    _readEncapsStack.pop_back();
+    if(_readEncapsStack.empty())
+    {
+	_currentReadEncaps = 0;
+    }
+    else
+    {
+	_currentReadEncaps = &_readEncapsStack.back();
+    }
+}
+
+void
+IceInternal::BasicStream::skipReadEncaps()
+{
     assert(_currentReadEncaps);
     int start = _currentReadEncaps->start;
     _readEncapsStack.pop_back();