diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-09 02:47:29 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-09 02:47:29 +0000 |
| commit | 56e56ecfac2de771fd6b4775adbb2dd12fdc72af (patch) | |
| tree | 412f33256979309733cccc3f63be58052d14fd88 /py/modules/IcePy/Communicator.cpp | |
| parent | Minor fix to initialize() (diff) | |
| download | ice-56e56ecfac2de771fd6b4775adbb2dd12fdc72af.tar.bz2 ice-56e56ecfac2de771fd6b4775adbb2dd12fdc72af.tar.xz ice-56e56ecfac2de771fd6b4775adbb2dd12fdc72af.zip | |
Fixes for bug #542 and #1015 (default properties)
Diffstat (limited to 'py/modules/IcePy/Communicator.cpp')
| -rw-r--r-- | py/modules/IcePy/Communicator.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp index 78a087e9cf7..f5c53e4e95e 100644 --- a/py/modules/IcePy/Communicator.cpp +++ b/py/modules/IcePy/Communicator.cpp @@ -133,20 +133,15 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) } - if(!data.properties) - { - data.properties = Ice::getDefaultProperties(seq); - } - + data.properties = Ice::createProperties(seq, data.properties); + // // Disable collocation optimization, otherwise a Python invocation on // a collocated servant results in a CollocationOptimizationException // (because Python uses the blobject API). // - seq.push_back("--Ice.Default.CollocationOptimization=0"); - - seq = data.properties->parseIceCommandLineOptions(seq); - + data.properties->setProperty("Ice.Default.CollocationOptimization", "0"); + // // Remaining command line options are passed to the communicator // as an argument vector in case they contain plugin properties. |