diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-03-29 15:36:53 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-03-29 15:36:53 -0700 |
| commit | 949ea036642e4640cf09aed1b2e70ca739579504 (patch) | |
| tree | fe646f06609f8496c132c9cad7e9cc4153d940c3 /python/modules/IcePy | |
| parent | Override java.lang.AutoCloseable.close in Ice.Communicator to not throw any e... (diff) | |
| download | ice-949ea036642e4640cf09aed1b2e70ca739579504.tar.bz2 ice-949ea036642e4640cf09aed1b2e70ca739579504.tar.xz ice-949ea036642e4640cf09aed1b2e70ca739579504.zip | |
ICE-7716 - more scripting language fixes
Diffstat (limited to 'python/modules/IcePy')
| -rw-r--r-- | python/modules/IcePy/Communicator.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index 563c02e1d31..ef4472f325f 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -250,11 +250,7 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) // data.valueFactoryManager = new ValueFactoryManager; - if(argList) - { - data.properties = Ice::createProperties(seq, data.properties); - } - else if(!data.properties) + if(!data.properties) { data.properties = Ice::createProperties(); } @@ -263,6 +259,11 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) { data.properties->load(getString(configFile)); } + + if(argList) + { + data.properties = Ice::createProperties(seq, data.properties); + } } catch(const Ice::Exception& ex) { |