diff options
| author | Mark Spruiell <mes@zeroc.com> | 2010-02-15 16:46:51 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2010-02-15 16:46:51 -0800 |
| commit | fa528e7ec8458904548eeb724d8b3fe272bd4c63 (patch) | |
| tree | 967ffcb59dc13e12e1a2fbd8fdf5c573e9b0ad99 /py/modules/IcePy/Communicator.cpp | |
| parent | minor fixes to makefiles (diff) | |
| download | ice-fa528e7ec8458904548eeb724d8b3fe272bd4c63.tar.bz2 ice-fa528e7ec8458904548eeb724d8b3fe272bd4c63.tar.xz ice-fa528e7ec8458904548eeb724d8b3fe272bd4c63.zip | |
bug 4633 - ICE_CONFIG fixes
Diffstat (limited to 'py/modules/IcePy/Communicator.cpp')
| -rw-r--r-- | py/modules/IcePy/Communicator.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp index f504520a574..bc84904b4a7 100644 --- a/py/modules/IcePy/Communicator.cpp +++ b/py/modules/IcePy/Communicator.cpp @@ -134,7 +134,7 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) // // Use the with-args or the without-args version of initialize()? // - bool hasArgs = !seq.empty(); + bool hasArgs = argList != 0; Ice::InitializationData data; if(initData) @@ -167,7 +167,14 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) try { - data.properties = Ice::createProperties(seq, data.properties); + if(argList) + { + data.properties = Ice::createProperties(seq, data.properties); + } + else if(!data.properties) + { + data.properties = Ice::createProperties(); + } } catch(const Ice::Exception& ex) { |