Bug 923 - read config as UTF8 and convert using string converter

1 files changed, 7 insertions, 7 deletions

diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 292b16892cc..16394eaec31 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -83,22 +83,22 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[])
 }
 
 PropertiesPtr
-Ice::createProperties()
+Ice::createProperties(const StringConverterPtr& converter)
 {
-    return new PropertiesI();
+    return new PropertiesI(converter);
 }
 
 PropertiesPtr
-Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults)
+Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults, const StringConverterPtr& converter)
 {
-    return new PropertiesI(args, defaults);
+    return new PropertiesI(args, defaults, converter);
 }
 
 PropertiesPtr
-Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults)
+Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults, const StringConverterPtr& converter)
 {
     StringSeq args = argsToStringSeq(argc, argv);
-    PropertiesPtr properties = createProperties(args, defaults);
+    PropertiesPtr properties = createProperties(args, defaults, converter);
     stringSeqToArgs(args, argc, argv);
     return properties;
 }
@@ -131,7 +131,7 @@ Ice::initialize(int& argc, char* argv[], const InitializationData& initializatio
     checkIceVersion(version);
 
     InitializationData initData = initializationData;
-    initData.properties = createProperties(argc, argv, initData.properties);
+    initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
 
     CommunicatorI* communicatorI = new CommunicatorI(initData);
     CommunicatorPtr result = communicatorI; // For exception safety.