remove use of readPendingObjects/writePendingObjects

1 files changed, 2 insertions, 21 deletions

diff --git a/py/modules/IcePy/Operation.cpp b/py/modules/IcePy/Operation.cpp
index 2c5931ba9ab..d5be3766521 100644
--- a/py/modules/IcePy/Operation.cpp
+++ b/py/modules/IcePy/Operation.cpp
@@ -1474,10 +1474,6 @@ IcePy::TypedInvocation::prepareRequest(PyObject* args, MappingType mapping, vect
                 (*p)->type->marshal(arg, os, &objectMap, &(*p)->metaData);
             }
 
-            if(_op->sendsClasses)
-            {
-                os->writePendingObjects();
-            }
             os->endEncapsulation();
             os->finished(bytes);
         }
@@ -1528,14 +1524,9 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice:
             _op->returnType->type->unmarshal(is, _op->returnType, results.get(), 0, &_op->metaData);
         }
 
-        if(_op->returnsClasses)
-        {
-            is->readPendingObjects();
-        }
+        is->endEncapsulation();
 
         util.update();
-
-        is->endEncapsulation();
     }
 
     return results.release();
@@ -3113,14 +3104,9 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con
                 (*p)->type->unmarshal(is, *p, args.get(), closure, &(*p)->metaData);
             }
 
-            if(_op->sendsClasses)
-            {
-                is->readPendingObjects();
-            }
+            is->endEncapsulation();
 
             util.update();
-
-            is->endEncapsulation();
         }
         catch(const AbortMarshaling&)
         {
@@ -3286,11 +3272,6 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin
                 _op->returnType->type->marshal(res, os, &objectMap, &_op->metaData);
             }
 
-            if(_op->returnsClasses)
-            {
-                os->writePendingObjects();
-            }
-
             os->endEncapsulation();
 
             Ice::ByteSeq bytes;