summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/ObjectAdapter.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2007-01-08 17:39:03 +0000
committerDwayne Boone <dwayne@zeroc.com>2007-01-08 17:39:03 +0000
commitb9c51083302aa66a840d9a6f176671ad5f37dadd (patch)
tree02e1f15cad1e539c2cacbf692ffae0cd40029ebf /py/modules/IcePy/ObjectAdapter.cpp
parent- Fixing bug 800. (diff)
downloadice-b9c51083302aa66a840d9a6f176671ad5f37dadd.tar.bz2
ice-b9c51083302aa66a840d9a6f176671ad5f37dadd.tar.xz
ice-b9c51083302aa66a840d9a6f176671ad5f37dadd.zip
Added Communicator::isShutdown() and ObjectAdapter::isDeactivated()
Diffstat (limited to 'py/modules/IcePy/ObjectAdapter.cpp')
-rw-r--r--py/modules/IcePy/ObjectAdapter.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/py/modules/IcePy/ObjectAdapter.cpp b/py/modules/IcePy/ObjectAdapter.cpp
index 5f244cdd46a..6eb9ac6c1d3 100644
--- a/py/modules/IcePy/ObjectAdapter.cpp
+++ b/py/modules/IcePy/ObjectAdapter.cpp
@@ -639,6 +639,27 @@ adapterWaitForDeactivate(ObjectAdapterObject* self, PyObject* args)
extern "C"
#endif
static PyObject*
+adapterIsDeactivated(ObjectAdapterObject* self)
+{
+ assert(self->adapter);
+ try
+ {
+ (*self->adapter)->isDeactivated();
+ }
+ catch(const Ice::Exception& ex)
+ {
+ setPythonException(ex);
+ return NULL;
+ }
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
adapterDestroy(ObjectAdapterObject* self)
{
assert(self->adapter);
@@ -1370,6 +1391,8 @@ static PyMethodDef AdapterMethods[] =
PyDoc_STR(STRCAST("deactivate() -> None")) },
{ STRCAST("waitForDeactivate"), (PyCFunction)adapterWaitForDeactivate, METH_VARARGS,
PyDoc_STR(STRCAST("waitForDeactivate() -> None")) },
+ { STRCAST("isDeactivated"), (PyCFunction)adapterIsDeactivated, METH_NOARGS,
+ PyDoc_STR(STRCAST("isDeactivatied() -> None")) },
{ STRCAST("destroy"), (PyCFunction)adapterDestroy, METH_NOARGS,
PyDoc_STR(STRCAST("destroy() -> None")) },
{ STRCAST("add"), (PyCFunction)adapterAdd, METH_VARARGS,