diff options
author | Bernard Normier <bernard@zeroc.com> | 2007-11-19 17:47:58 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2007-11-19 17:47:58 -0500 |
commit | 3b6fe107bd8813315875d237a762fe6f4e4716ce (patch) | |
tree | 269db270f5cfc77b3dc281d15b3ebacf1474f5be /cpp/src/Ice/Service.cpp | |
parent | Fixed Freeze/Windows build (diff) | |
download | ice-3b6fe107bd8813315875d237a762fe6f4e4716ce.tar.bz2 ice-3b6fe107bd8813315875d237a762fe6f4e4716ce.tar.xz ice-3b6fe107bd8813315875d237a762fe6f4e4716ce.zip |
Fixed bug #2562
Diffstat (limited to 'cpp/src/Ice/Service.cpp')
-rwxr-xr-x | cpp/src/Ice/Service.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index 312a6914fc7..ff458377978 100755 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -389,16 +389,7 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa // On Windows, we parse the properties here to extract Ice.EventLog.Source // InitializationData initData = initializationData; - if(initData.properties == 0) - { - initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); - } - else - { - StringSeq options = argsToStringSeq(argc, argv); - options = initData.properties->parseIceCommandLineOptions(options); - stringSeqToArgs(options, argc, argv); - } + initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); // // First check for the --service option. |