1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 5e92c6c05d5..db7c0041b45 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <IceUtil/StringUtil.h>
+#include <Ice/StringUtil.h>
 #include <Ice/TraceUtil.h>
 #include <Ice/Instance.h>
 #include <Ice/Object.h>
@@ -29,16 +29,22 @@ using namespace IceInternal;
 static void
 printIdentityFacetOperation(ostream& s, InputStream& stream)
 {
+    ToStringMode toStringMode = ICE_ENUM(ToStringMode, Unicode);
+    if(stream.instance())
+    {
+        toStringMode = stream.instance()->toStringMode();
+    }
+
     Identity identity;
     stream.read(identity);
-    s << "\nidentity = " << Ice::identityToString(identity);
+    s << "\nidentity = " << Ice::identityToString(identity, toStringMode);
 
     vector<string> facet;
     stream.read(facet);
     s << "\nfacet = ";
     if(!facet.empty())
     {
-        s << IceUtilInternal::escapeString(facet[0], "");
+        s << escapeString(facet[0], "", toStringMode);
     }
 
     string operation;