1 files changed, 10 insertions, 6 deletions

diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 03264b5898c..74f65e2d808 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -785,12 +785,13 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
             Trace out(ref->getInstance()->initializationData().logger,
                       ref->getInstance()->traceLevels()->locationCat);
             out << "object not found" << "\n";
-            out << "object = " << Ice::identityToString(ref->getIdentity());
+            out << "object = " << Ice::identityToString(ref->getIdentity(),
+                                                        ref->getInstance()->toStringMode());
         }
 
         NotRegisteredException ex(__FILE__, __LINE__);
         ex.kindOfObject = "object";
-        ex.id = Ice::identityToString(ref->getIdentity());
+        ex.id = Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode());
         throw ex;
     }
     catch(const NotRegisteredException&)
@@ -805,7 +806,8 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
             out << "couldn't contact the locator to retrieve adapter endpoints\n";
             if(ref->getAdapterId().empty())
             {
-                out << "object = " << Ice::identityToString(ref->getIdentity()) << "\n";
+                out << "object = " << Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode())
+                    << "\n";
             }
             else
             {
@@ -840,7 +842,7 @@ IceInternal::LocatorInfo::getEndpointsTrace(const ReferencePtr& ref,
         if(ref->getAdapterId().empty())
         {
             out << "object\n";
-            out << "object = " << Ice::identityToString(ref->getIdentity());
+            out << "object = " << Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode());
         }
         else
         {
@@ -863,7 +865,8 @@ IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, cons
     }
     else
     {
-        out << "object = "  << Ice::identityToString(ref->getIdentity()) << '\n';
+        out << "object = "  << Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode())
+            << '\n';
     }
 
     const char* sep = endpoints.size() > 1 ? ":" : "";
@@ -901,7 +904,8 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref)
     if(ref->getInstance()->traceLevels()->location >= 1)
     {
         Trace out(ref->getInstance()->initializationData().logger, ref->getInstance()->traceLevels()->locationCat);
-        out << "searching for object by id\nobject = " << Ice::identityToString(ref->getIdentity());
+        out << "searching for object by id\nobject = " << Ice::identityToString(ref->getIdentity(),
+                                                                                ref->getInstance()->toStringMode());
     }
 
     map<Ice::Identity, RequestPtr>::const_iterator p = _objectRequests.find(ref->getIdentity());