diff options
| author | Mark Spruiell <mes@zeroc.com> | 2004-09-02 18:13:39 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2004-09-02 18:13:39 +0000 |
| commit | a2819a4872e31789b53af2a1daca37e044603e8f (patch) | |
| tree | 1064ac37006763e8ec3ea40009e5b768f5dff832 /py/modules/IcePy/Proxy.cpp | |
| parent | adding slice2py (diff) | |
| download | ice-a2819a4872e31789b53af2a1daca37e044603e8f.tar.bz2 ice-a2819a4872e31789b53af2a1daca37e044603e8f.tar.xz ice-a2819a4872e31789b53af2a1daca37e044603e8f.zip | |
first round of marshaling refactor
Diffstat (limited to 'py/modules/IcePy/Proxy.cpp')
| -rw-r--r-- | py/modules/IcePy/Proxy.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp index 9305f0dcd11..56bd7276a9f 100644 --- a/py/modules/IcePy/Proxy.cpp +++ b/py/modules/IcePy/Proxy.cpp @@ -150,10 +150,7 @@ IcePy::Operation::invoke(const Ice::ObjectPrx& proxy, const Ice::CommunicatorPtr for(vector<MarshalerPtr>::iterator p = _inParams.begin(); p != _inParams.end(); ++p, ++i) { PyObject* arg = PyTuple_GET_ITEM(args, i); - if(!(*p)->marshal(arg, os, &objectMap)) - { - return NULL; - } + (*p)->marshal(arg, os, &objectMap); } Ice::ByteSeq params; @@ -214,7 +211,7 @@ IcePy::Operation::invoke(const Ice::ObjectPrx& proxy, const Ice::CommunicatorPtr ObjectMarshalerPtr om = ObjectMarshalerPtr::dynamicCast(*q); if(om) { - om->unmarshalObject(communicator, is, new TupleReceiver(results.get(), i)); + om->unmarshalObject(communicator, is, new TupleReceiver(om->info(), results.get(), i)); } else { @@ -232,7 +229,7 @@ IcePy::Operation::invoke(const Ice::ObjectPrx& proxy, const Ice::CommunicatorPtr ObjectMarshalerPtr om = ObjectMarshalerPtr::dynamicCast(_resultMarshaler); if(om) { - om->unmarshalObject(communicator, is, new TupleReceiver(results.get(), 0)); + om->unmarshalObject(communicator, is, new TupleReceiver(om->info(), results.get(), 0)); } else { |