summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/ObjectAdapter.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2007-05-15 20:28:02 +0000
committerMark Spruiell <mes@zeroc.com>2007-05-15 20:28:02 +0000
commitb0fc782f41b5388f798bb525ae78a735f6a057af (patch)
tree30c54aa14995ccd14f6c2a4b397f2c2e1f1dfd8f /py/modules/IcePy/ObjectAdapter.cpp
parentSimplified AMD support (diff)
downloadice-b0fc782f41b5388f798bb525ae78a735f6a057af.tar.bz2
ice-b0fc782f41b5388f798bb525ae78a735f6a057af.tar.xz
ice-b0fc782f41b5388f798bb525ae78a735f6a057af.zip
bug 2210 - segfault when terminating a server with a signal
Diffstat (limited to 'py/modules/IcePy/ObjectAdapter.cpp')
-rw-r--r--py/modules/IcePy/ObjectAdapter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/py/modules/IcePy/ObjectAdapter.cpp b/py/modules/IcePy/ObjectAdapter.cpp
index d8b6d12e341..37fb4e2b7e8 100644
--- a/py/modules/IcePy/ObjectAdapter.cpp
+++ b/py/modules/IcePy/ObjectAdapter.cpp
@@ -123,6 +123,8 @@ IcePy::ServantWrapper::ServantWrapper(PyObject* servant) :
IcePy::ServantWrapper::~ServantWrapper()
{
+ AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
+
Py_DECREF(_servant);
}