Fixed bug 1042

3 files changed, 8 insertions, 7 deletions

diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index d4146300f9e..03a34e854c3 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -65,7 +65,7 @@ struct InitializationData
     ThreadNotificationPtr threadHook;
 };
 
-ICE_API CommunicatorPtr initialize(int&, char*[], InitializationData = InitializationData(),
+ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = InitializationData(),
 				   Int = ICE_INT_VERSION);
 ICE_API ICE_DEPRECATED_API CommunicatorPtr initializeWithProperties(int&, char*[], const PropertiesPtr&,
 								    Int = ICE_INT_VERSION);
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index d7087d703f4..fe29d051696 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -68,7 +68,7 @@ private:
     //
     void finishSetup(int&, char*[]);
 
-    friend ICE_API CommunicatorPtr initialize(int&, char*[], InitializationData, Int);
+    friend ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData&, Int);
     friend ICE_API ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&);
 
     const ::IceInternal::InstancePtr _instance;
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index b8bd4946e72..ca108e8db85 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -148,7 +148,7 @@ Ice::getDefaultProperties(int& argc, char* argv[])
 }
 
 CommunicatorPtr
-Ice::initialize(int& argc, char* argv[], InitializationData initData, Int version)
+Ice::initialize(int& argc, char* argv[], const InitializationData& initData, Int version)
 {
 #ifndef ICE_IGNORE_VERSION
     //
@@ -168,15 +168,16 @@ Ice::initialize(int& argc, char* argv[], InitializationData initData, Int versio
     }
 #endif
 
-    if(initData.properties == 0)
+    InitializationData tmpData = initData;
+    if(tmpData.properties == 0)
     {
-        initData.properties = getDefaultProperties(argc, argv);
+        tmpData.properties = getDefaultProperties(argc, argv);
     }
     StringSeq args = argsToStringSeq(argc, argv);
-    args = initData.properties->parseIceCommandLineOptions(args);
+    args = tmpData.properties->parseIceCommandLineOptions(args);
     stringSeqToArgs(args, argc, argv);
 
-    CommunicatorI* communicatorI = new CommunicatorI(initData);
+    CommunicatorI* communicatorI = new CommunicatorI(tmpData);
     CommunicatorPtr result = communicatorI; // For exception safety.
     communicatorI->finishSetup(argc, argv);
     return result;