From 847655b81a9473a7013b89a9ad68f358cbec2545 Mon Sep 17 00:00:00 2001 From: Mark Spruiell Date: Thu, 16 Mar 2017 08:15:47 -0700 Subject: ICE-7674 - Python batch request interceptor bug --- python/modules/IcePy/BatchRequestInterceptor.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'python/modules/IcePy/BatchRequestInterceptor.cpp') diff --git a/python/modules/IcePy/BatchRequestInterceptor.cpp b/python/modules/IcePy/BatchRequestInterceptor.cpp index 83577944689..a39bfa6bd9c 100644 --- a/python/modules/IcePy/BatchRequestInterceptor.cpp +++ b/python/modules/IcePy/BatchRequestInterceptor.cpp @@ -261,8 +261,15 @@ IcePy::BatchRequestInterceptor::enqueue(const Ice::BatchRequest& request, int qu obj->size = 0; obj->operation = 0; obj->proxy = 0; - PyObjectHandle tmp = PyObject_CallMethod(_interceptor.get(), STRCAST("enqueue"), STRCAST("Oii"), obj, queueCount, - queueSize); + PyObjectHandle tmp; + if(PyCallable_Check(_interceptor.get())) + { + tmp = PyObject_CallFunction(_interceptor.get(), STRCAST("Oii"), obj, queueCount, queueSize); + } + else + { + tmp = PyObject_CallMethod(_interceptor.get(), STRCAST("enqueue"), STRCAST("Oii"), obj, queueCount, queueSize); + } Py_DECREF(reinterpret_cast(obj)); if(!tmp.get()) { -- cgit v1.2.3