Backed out previous fix for bug 2153 as I'm not convinced it's correct.

1 files changed, 12 insertions, 0 deletions

diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index b8fb3035d27..3ffadc78573 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -274,6 +274,18 @@ IceInternal::BasicStream::ReadEncaps::swap(ReadEncaps& other)
     std::swap(previous, other.previous);
 }
 
+void
+IceInternal::BasicStream::checkReadEncaps()
+{
+    assert(_currentReadEncaps);
+    Container::size_type start = _currentReadEncaps->start;
+    Int sz = _currentReadEncaps->sz;
+    if(i != b.begin() + start + sz)
+    {
+        throw EncapsulationException(__FILE__, __LINE__);
+    }
+}
+
 Int
 IceInternal::BasicStream::getReadEncapsSize()
 {