[hydra-commits] kpfleming: branch ice/skipped-slice-recovery r570 - in /ice/branches/skipped-...

[SVN commits to the Hydra project]

Author: kpfleming
Date: Fri Apr  9 11:55:35 2010
New Revision: 570

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=570
Log:
make name of API call what I had intended for it to be...

add readSkippedSlicesBlob support for exceptions


Modified:
    ice/branches/skipped-slice-recovery/cpp/include/Ice/BasicStream.h
    ice/branches/skipped-slice-recovery/cpp/src/Ice/BasicStream.cpp

Modified: ice/branches/skipped-slice-recovery/cpp/include/Ice/BasicStream.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/include/Ice/BasicStream.h?view=diff&rev=570&r1=569&r2=570
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/include/Ice/BasicStream.h (original)
+++ ice/branches/skipped-slice-recovery/cpp/include/Ice/BasicStream.h Fri Apr  9 11:55:35 2010
@@ -301,7 +301,7 @@
     void writeBlob(const std::vector<Ice::Byte>&);
     void readBlob(std::vector<Ice::Byte>&, Ice::Int);
 
-    void readSkippedSliceBlob(std::vector<Ice::Byte>&);
+    void readSkippedSlicesBlob(std::vector<Ice::Byte>&);
 
     void writeBlob(const Ice::Byte* v, Container::size_type sz)
     {

Modified: ice/branches/skipped-slice-recovery/cpp/src/Ice/BasicStream.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/src/Ice/BasicStream.cpp?view=diff&rev=570&r1=569&r2=570
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/src/Ice/BasicStream.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/src/Ice/BasicStream.cpp Fri Apr  9 11:55:35 2010
@@ -439,7 +439,7 @@
 }
 
 void
-IceInternal::BasicStream::readSkippedSliceBlob(vector<Byte>& v)
+IceInternal::BasicStream::readSkippedSlicesBlob(vector<Byte>& v)
 {
     if(_currentObjectStart < _currentSliceStart)
     {
@@ -1936,6 +1936,7 @@
     bool usesClasses;
     read(usesClasses);
 
+    _currentObjectStart = _currentSliceStart = i;
     string id;
     read(id, false);
     const string origId = id;
@@ -1984,6 +1985,7 @@
             }
 
             skipSlice(); // Slice off what we don't understand.
+            _currentSliceStart = i;
 
             try
             {