summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Operation.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-01-06 14:46:56 -0800
committerMark Spruiell <mes@zeroc.com>2012-01-06 14:46:56 -0800
commit82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa (patch)
tree9bd3e20e7e5d18ab0f3828c3047dccbf14632a83 /py/modules/IcePy/Operation.cpp
parentICE-4471 Synchronization in Freeze MapI.java (diff)
downloadice-82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa.tar.bz2
ice-82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa.tar.xz
ice-82ab16f0eca2e1cd4f8897d7dea60d4dfe5526aa.zip
ICE-4701 - AsyncResult::getCommunicator returns null
Diffstat (limited to 'py/modules/IcePy/Operation.cpp')
-rw-r--r--py/modules/IcePy/Operation.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/py/modules/IcePy/Operation.cpp b/py/modules/IcePy/Operation.cpp
index b8dfed5e909..8d8c1b8e6e2 100644
--- a/py/modules/IcePy/Operation.cpp
+++ b/py/modules/IcePy/Operation.cpp
@@ -11,6 +11,7 @@
# include <IceUtil/Config.h>
#endif
#include <Operation.h>
+#include <Communicator.h>
#include <Current.h>
#include <Proxy.h>
#include <Types.h>
@@ -1810,7 +1811,8 @@ IcePy::AsyncTypedInvocation::invoke(PyObject* args, PyObject* /* kwds */)
try
{
checkAsyncTwowayOnly(_prx);
- pair<const Ice::Byte*, const Ice::Byte*> pparams(static_cast<const Ice::Byte*>(0),static_cast<const Ice::Byte*>(0));
+ pair<const Ice::Byte*, const Ice::Byte*> pparams(static_cast<const Ice::Byte*>(0),
+ static_cast<const Ice::Byte*>(0));
if(!params.empty())
{
pparams.first = &params[0];
@@ -1893,6 +1895,7 @@ IcePy::AsyncTypedInvocation::invoke(PyObject* args, PyObject* /* kwds */)
obj->invocation = new InvocationPtr(this);
obj->proxy = _pyProxy;
Py_INCREF(obj->proxy);
+ obj->communicator = getCommunicatorWrapper(_communicator);
return reinterpret_cast<PyObject*>(obj);
}
@@ -2542,6 +2545,7 @@ IcePy::AsyncBlobjectInvocation::invoke(PyObject* args, PyObject* kwds)
obj->invocation = new InvocationPtr(this);
obj->proxy = _pyProxy;
Py_INCREF(obj->proxy);
+ obj->communicator = getCommunicatorWrapper(_prx->ice_getCommunicator());
return reinterpret_cast<PyObject*>(obj);
}