- Fixing bug 2522 for Python. This involved adding the C++ class

  UserExceptionWriter so that the Python extension can wrap a native
  Python user exception into something that the C++ run time can
  marshal. Also ported the changes to the servantLocator test.

- Implementing UserExceptionWriter in Java and C#.

- Consolidating the source files for the C# streaming API.

1 files changed, 10 insertions, 1 deletions

diff --git a/py/modules/IcePy/Util.cpp b/py/modules/IcePy/Util.cpp
index edf92dc2c14..98f51a460e0 100644
--- a/py/modules/IcePy/Util.cpp
+++ b/py/modules/IcePy/Util.cpp
@@ -58,7 +58,7 @@ IcePy::PyObjectHandle::operator=(const PyObjectHandle& p)
 }
 
 PyObject*
-IcePy::PyObjectHandle::get()
+IcePy::PyObjectHandle::get() const
 {
     return _p;
 }
@@ -153,6 +153,15 @@ IcePy::PyException::raise()
 }
 
 void
+IcePy::PyException::checkSystemExit()
+{
+    if(PyObject_IsInstance(ex.get(), PyExc_SystemExit))
+    {
+        handleSystemExit(ex.get()); // Does not return.
+    }
+}
+
+void
 IcePy::PyException::raiseLocalException()
 {
     string typeName = getTypeName();