From 3cb9c15995b828c52dba34d0a222f572d5bbc41b Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 20 Oct 2016 21:03:44 -0400
Subject: Added support for non-ASCII characters and universal character names
 to stringified identities and proxies. This includes a new Ice.ToStringMode
 property.

---
 cpp/src/Ice/ServantManager.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'cpp/src/Ice/ServantManager.cpp')

diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 3d1f51112ae..16c5da45d1f 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -12,7 +12,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/Instance.h>
-#include <IceUtil/StringUtil.h>
+#include <Ice/StringUtil.h>
 
 using namespace std;
 using namespace Ice;
@@ -44,11 +44,11 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity&
         {
             AlreadyRegisteredException ex(__FILE__, __LINE__);
             ex.kindOfObject = "servant";
-            ex.id = Ice::identityToString(ident);
+            ToStringMode toStringMode = _instance->toStringMode();
+            ex.id = Ice::identityToString(ident, toStringMode);
             if(!facet.empty())
             {
-                string fs = nativeToUTF8(facet, _instance->getStringConverter());
-                ex.id += " -f " + IceUtilInternal::escapeString(fs, "");
+                ex.id += " -f " + escapeString(facet, "", toStringMode);
             }
             throw ex;
         }
@@ -104,11 +104,11 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string&
     {
         NotRegisteredException ex(__FILE__, __LINE__);
         ex.kindOfObject = "servant";
-        ex.id = Ice::identityToString(ident);
+        ToStringMode toStringMode = _instance->toStringMode();
+        ex.id = Ice::identityToString(ident, toStringMode);
         if(!facet.empty())
         {
-            string fs = nativeToUTF8(facet, _instance->getStringConverter());
-            ex.id += " -f " + IceUtilInternal::escapeString(fs, "");
+            ex.id += " -f " + escapeString(facet, "", toStringMode);
         }
         throw ex;
     }
@@ -178,7 +178,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
     {
         NotRegisteredException ex(__FILE__, __LINE__);
         ex.kindOfObject = "servant";
-        ex.id = Ice::identityToString(ident);
+        ex.id = Ice::identityToString(ident, _instance->toStringMode());
         throw ex;
     }
 
-- 
cgit v1.2.3