diff options
| author | Mark Spruiell <mes@zeroc.com> | 2014-07-14 15:12:28 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2014-07-14 15:12:28 -0700 |
| commit | e1378c9fb2c4c07ea3a6bff9efc33dab784cc8de (patch) | |
| tree | 22c594f30fe102b4a0d68e54648e5f68ab246451 /py/modules/IcePy/Util.cpp | |
| parent | Demo script fixes (diff) | |
| download | ice-e1378c9fb2c4c07ea3a6bff9efc33dab784cc8de.tar.bz2 ice-e1378c9fb2c4c07ea3a6bff9efc33dab784cc8de.tar.xz ice-e1378c9fb2c4c07ea3a6bff9efc33dab784cc8de.zip | |
- Fix for ICE-5578 - Python build failure
- Fixed ObjectAdapter impl to accept None for servant arguments
- Added support for IllegalServantException
Diffstat (limited to 'py/modules/IcePy/Util.cpp')
| -rw-r--r-- | py/modules/IcePy/Util.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/py/modules/IcePy/Util.cpp b/py/modules/IcePy/Util.cpp index a496bbbbe17..943e79b3257 100644 --- a/py/modules/IcePy/Util.cpp +++ b/py/modules/IcePy/Util.cpp @@ -851,6 +851,11 @@ convertLocalException(const Ice::LocalException& ex, PyObject* p) IcePy::PyObjectHandle m = IcePy::createString(e.reason); PyObject_SetAttrString(p, STRCAST("reason"), m.get()); } + catch(const Ice::IllegalServantException& e) + { + IcePy::PyObjectHandle m = IcePy::createString(e.reason); + PyObject_SetAttrString(p, STRCAST("reason"), m.get()); + } catch(const Ice::LocalException&) { // |