summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/ServantManager.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-05-09 13:07:41 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-05-09 13:07:41 +0000
commit197b6de9281b52d0b53c4b3fa3312e371b4469a9 (patch)
treebae93f8155da0770f5dd45d12ef1160ee99aed54 /cppe/src/IceE/ServantManager.cpp
parentAdded identityToString and stringToIdentity to Communicator (diff)
downloadice-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 'cppe/src/IceE/ServantManager.cpp')
-rw-r--r--cppe/src/IceE/ServantManager.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/cppe/src/IceE/ServantManager.cpp b/cppe/src/IceE/ServantManager.cpp
index 5e83ed63031..0baae3e9083 100644
--- a/cppe/src/IceE/ServantManager.cpp
+++ b/cppe/src/IceE/ServantManager.cpp
@@ -9,7 +9,6 @@
#include <IceE/ServantManager.h>
#include <IceE/LocalException.h>
-#include <IceE/IdentityUtil.h>
#include <IceE/Instance.h>
#include <IceE/StringUtil.h>
@@ -44,7 +43,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, "");
@@ -84,7 +83,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, "");
@@ -128,7 +127,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;
}