diff options
| author | Michi Henning <michi@zeroc.com> | 2002-12-05 13:42:24 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-12-05 13:42:24 +0000 |
| commit | ced46bb606327deac6348ad9ed484802f92956ee (patch) | |
| tree | da74d005c0683b558acdd40ff11f1287deecab0d /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | file TestAMDI.cpp was initially added on branch amd. (diff) | |
| download | ice-ced46bb606327deac6348ad9ed484802f92956ee.tar.bz2 ice-ced46bb606327deac6348ad9ed484802f92956ee.tar.xz ice-ced46bb606327deac6348ad9ed484802f92956ee.zip | |
Fixed incorrect _kindOfObject assignments.
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index f4c1fafddd4..b97cd286eda 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -41,8 +41,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -const char * const Ice::ObjectAdapterI::_kindOfObject = "object adapter"; - CommunicatorPtr Ice::ObjectAdapterI::getCommunicator() { @@ -90,14 +88,14 @@ Ice::ObjectAdapterI::activate() catch(const Ice::AdapterNotRegisteredException&) { NotRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = _kindOfObject; + ex.kindOfObject = "object adapter"; ex.id = _id; throw ex; } catch(const Ice::AdapterAlreadyActiveException&) { AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = _kindOfObject; + ex.kindOfObject = "object adapter"; ex.id = _id; throw ex; } @@ -195,7 +193,7 @@ Ice::ObjectAdapterI::add(const ObjectPtr& object, const Identity& ident) || _activeServantMap.find(ident) != _activeServantMap.end()) { AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = _kindOfObject; + ex.kindOfObject = "servant"; ex.id = identityToString(ident); throw ex; } @@ -243,7 +241,7 @@ Ice::ObjectAdapterI::remove(const Identity& ident) if(p == _activeServantMap.end()) { NotRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = _kindOfObject; + ex.kindOfObject = "servant"; ex.id = identityToString(ident); throw ex; } @@ -268,7 +266,7 @@ Ice::ObjectAdapterI::addServantLocator(const ServantLocatorPtr& locator, const s || _locatorMap.find(prefix) != _locatorMap.end()) { AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = _kindOfObject; + ex.kindOfObject = "servant locator"; ex.id = prefix; throw ex; } @@ -304,7 +302,7 @@ Ice::ObjectAdapterI::removeServantLocator(const string& prefix) if (p == _locatorMap.end()) { NotRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = _kindOfObject; + ex.kindOfObject = "servant locator"; ex.id = prefix; throw ex; } |