From 3cb9c15995b828c52dba34d0a222f572d5bbc41b Mon Sep 17 00:00:00 2001 From: Bernard Normier 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/IceGrid/ObjectCache.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpp/src/IceGrid/ObjectCache.cpp') diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp index 9d7138e7050..cc76cc2d9b7 100644 --- a/cpp/src/IceGrid/ObjectCache.cpp +++ b/cpp/src/IceGrid/ObjectCache.cpp @@ -82,7 +82,7 @@ ObjectCache::add(const ObjectInfo& info, const string& application) if(getImpl(id)) { Ice::Error out(_communicator->getLogger()); - out << "can't add duplicate object `" << identityToString(id) << "'"; + out << "can't add duplicate object `" << _communicator->identityToString(id) << "'"; return; } @@ -99,7 +99,7 @@ ObjectCache::add(const ObjectInfo& info, const string& application) if(_traceLevels && _traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "added object `" << identityToString(id) << "'"; + out << "added object `" << _communicator->identityToString(id) << "'"; } } @@ -123,7 +123,7 @@ ObjectCache::remove(const Ice::Identity& id) if(!entry) { Ice::Error out(_communicator->getLogger()); - out << "can't remove unknown object `" << identityToString(id) << "'"; + out << "can't remove unknown object `" << _communicator->identityToString(id) << "'"; return; } removeImpl(id); @@ -138,7 +138,7 @@ ObjectCache::remove(const Ice::Identity& id) if(_traceLevels && _traceLevels->object > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat); - out << "removed object `" << identityToString(id) << "'"; + out << "removed object `" << _communicator->identityToString(id) << "'"; } } @@ -167,7 +167,7 @@ ObjectCache::getAll(const string& expression) ObjectInfoSeq infos; for(map::const_iterator p = _entries.begin(); p != _entries.end(); ++p) { - if(expression.empty() || IceUtilInternal::match(identityToString(p->first), expression, true)) + if(expression.empty() || IceUtilInternal::match(_communicator->identityToString(p->first), expression, true)) { infos.push_back(p->second->getObjectInfo()); } -- cgit v1.2.3