summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Operation.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-02-12 11:42:01 -0800
committerMark Spruiell <mes@zeroc.com>2009-02-12 11:42:01 -0800
commit215dbf06a885c6754572279b38d2ac4e823a57ba (patch)
tree1af98a5457c070bc0a233039504a6c97fcd2222a /py/modules/IcePy/Operation.cpp
parentminor tweaks to various README/INSTALL files (diff)
downloadice-215dbf06a885c6754572279b38d2ac4e823a57ba.tar.bz2
ice-215dbf06a885c6754572279b38d2ac4e823a57ba.tar.xz
ice-215dbf06a885c6754572279b38d2ac4e823a57ba.zip
bug 3356 - review use of AbortMarshaling in Python extension
Diffstat (limited to 'py/modules/IcePy/Operation.cpp')
-rw-r--r--py/modules/IcePy/Operation.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/py/modules/IcePy/Operation.cpp b/py/modules/IcePy/Operation.cpp
index d039c1fd3e2..c72835747d9 100644
--- a/py/modules/IcePy/Operation.cpp
+++ b/py/modules/IcePy/Operation.cpp
@@ -903,6 +903,7 @@ IcePy::TypedInvocation::prepareRequest(PyObject* args, bool async, vector<Ice::B
}
catch(const AbortMarshaling&)
{
+ assert(PyErr_Occurred());
return false;
}
catch(const Ice::Exception& ex)
@@ -1171,6 +1172,7 @@ IcePy::SyncTypedInvocation::invoke(PyObject* args)
}
catch(const AbortMarshaling&)
{
+ assert(PyErr_Occurred());
return 0;
}
catch(const Ice::Exception& ex)