diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-05-09 13:07:41 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-05-09 13:07:41 +0000 |
| commit | 197b6de9281b52d0b53c4b3fa3312e371b4469a9 (patch) | |
| tree | bae93f8155da0770f5dd45d12ef1160ee99aed54 /cpp/src/Ice/ServantManager.cpp | |
| parent | Added identityToString and stringToIdentity to Communicator (diff) | |
| download | ice-197b6de9281b52d0b53c4b3fa3312e371b4469a9.tar.bz2 ice-197b6de9281b52d0b53c4b3fa3312e371b4469a9.tar.xz ice-197b6de9281b52d0b53c4b3fa3312e371b4469a9.zip | |
Fixed proxy and identity t/from string functions to use string converters
Diffstat (limited to 'cpp/src/Ice/ServantManager.cpp')
| -rw-r--r-- | cpp/src/Ice/ServantManager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp index 8fcee751d14..c4c623edcfe 100644 --- a/cpp/src/Ice/ServantManager.cpp +++ b/cpp/src/Ice/ServantManager.cpp @@ -10,7 +10,6 @@ #include <Ice/ServantManager.h> #include <Ice/ServantLocator.h> #include <Ice/LocalException.h> -#include <Ice/IdentityUtil.h> #include <Ice/LoggerUtil.h> #include <Ice/Instance.h> #include <IceUtil/StringUtil.h> @@ -46,7 +45,7 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& { AlreadyRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "servant"; - ex.id = identityToString(ident); + ex.id = _instance->identityToString(ident); if(!facet.empty()) { ex.id += " -f " + IceUtil::escapeString(facet, ""); @@ -86,7 +85,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string& { NotRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "servant"; - ex.id = identityToString(ident); + ex.id = _instance->identityToString(ident); if(!facet.empty()) { ex.id += " -f " + IceUtil::escapeString(facet, ""); @@ -130,7 +129,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident) { NotRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "servant"; - ex.id = identityToString(ident); + ex.id = _instance->identityToString(ident); throw ex; } |