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/Ice/ServantManager.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/Ice/ServantManager.cpp')
| -rw-r--r-- | cpp/src/Ice/ServantManager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp index 080ba9ee042..3fbd1d1fc22 100644 --- a/cpp/src/Ice/ServantManager.cpp +++ b/cpp/src/Ice/ServantManager.cpp @@ -47,7 +47,8 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& ex.id = _instance->identityToString(ident); if(!facet.empty()) { - ex.id += " -f " + IceUtilInternal::escapeString(facet, ""); + string fs = nativeToUTF8(_instance->initializationData().stringConverter, facet); + ex.id += " -f " + IceUtilInternal::escapeString(fs, ""); } throw ex; } @@ -106,7 +107,8 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string& ex.id = _instance->identityToString(ident); if(!facet.empty()) { - ex.id += " -f " + IceUtilInternal::escapeString(facet, ""); + string fs = nativeToUTF8(_instance->initializationData().stringConverter, facet); + ex.id += " -f " + IceUtilInternal::escapeString(fs, ""); } throw ex; } @@ -333,7 +335,7 @@ IceInternal::ServantManager::addServantLocator(const ServantLocatorPtr& locator, { AlreadyRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "servant locator"; - ex.id = IceUtilInternal::escapeString(category, ""); + ex.id = category; throw ex; } @@ -365,7 +367,7 @@ IceInternal::ServantManager::removeServantLocator(const string& category) { NotRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "servant locator"; - ex.id = IceUtilInternal::escapeString(category, ""); + ex.id = category; throw ex; } |