4858 - Fix Application in C++/C# to create properties if necessary

1 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 1edd0b8677e..1185c5f5d61 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -358,7 +358,7 @@ Ice::Application::main(int argc, wchar_t* argv[], const Ice::InitializationData&
 #endif
 
 int
-Ice::Application::main(int argc, char* argv[], const InitializationData& initData)
+Ice::Application::main(int argc, char* argv[], const InitializationData& initializationData)
 {
     if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger()))
     {
@@ -373,6 +373,12 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat
     }
     int status;
 
+    //
+    // We parse the properties here to extract Ice.ProgramName.
+    //
+    InitializationData initData = initializationData;
+    initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
+
     if(IceInternal::Application::_signalPolicy == HandleSignals)
     {
         try
@@ -606,7 +612,7 @@ Ice::Application::interrupted()
 }
 
 int
-Ice::Application::doMain(int argc, char* argv[], const InitializationData& initializationData)
+Ice::Application::doMain(int argc, char* argv[], const InitializationData& initData)
 {
     int status;
 
@@ -620,12 +626,6 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
         }
 
         //
-        // We parse the properties here to extract Ice.ProgramName.
-        // 
-        InitializationData initData = initializationData;
-        initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
-
-        //
         // If the process logger is the default logger, we now replace it with a
         // a logger which is using the program name for the prefix.
         //