diff options
| author | Jose <jose@zeroc.com> | 2009-11-10 05:30:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-11-10 05:30:26 +0100 |
| commit | 4247c9e2c2612394a5f4d63a65ba538f975906d4 (patch) | |
| tree | 96d3308681d9b0684ce5dd763f5a5d415eaf09d7 /cpp/src/IceSSL/Instance.cpp | |
| parent | Win32 64 bits compilation error (diff) | |
| download | ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.tar.bz2 ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.tar.xz ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.zip | |
Fixed 3962 - Berkeley DB, problems with unicode paths.
Diffstat (limited to 'cpp/src/IceSSL/Instance.cpp')
| -rw-r--r-- | cpp/src/IceSSL/Instance.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp index de78f1115a9..40ca4cc0d7f 100644 --- a/cpp/src/IceSSL/Instance.cpp +++ b/cpp/src/IceSSL/Instance.cpp @@ -18,6 +18,7 @@ #include <Ice/LoggerUtil.h> #include <Ice/Properties.h> #include <Ice/ProtocolPluginFacade.h> +#include <Ice/StringConverter.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> @@ -208,7 +209,8 @@ IceSSL::Instance::Instance(const CommunicatorPtr& communicator) : { RAND_load_file(randFile, 1024); } - string randFiles = properties->getProperty("IceSSL.Random"); + string randFiles = Ice::nativeToUTF8(communicator, properties->getProperty("IceSSL.Random")); + if(!randFiles.empty()) { vector<string> files; @@ -217,7 +219,8 @@ IceSSL::Instance::Instance(const CommunicatorPtr& communicator) : #else const string sep = ":"; #endif - string defaultDir = properties->getProperty("IceSSL.DefaultDir"); + string defaultDir = Ice::nativeToUTF8(communicator, properties->getProperty("IceSSL.DefaultDir")); + if(!IceUtilInternal::splitString(randFiles, sep, files)) { PluginInitializationException ex(__FILE__, __LINE__); |