diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-12-05 22:28:48 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-12-05 22:28:48 +0000 |
| commit | 72490028ccf2a01b549022ef5eb588776137fb1a (patch) | |
| tree | 5f13a71b0e26b566ec1b3d581b91023f43622f48 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Visual C++ Warning Fix. (diff) | |
| download | ice-72490028ccf2a01b549022ef5eb588776137fb1a.tar.bz2 ice-72490028ccf2a01b549022ef5eb588776137fb1a.tar.xz ice-72490028ccf2a01b549022ef5eb588776137fb1a.zip | |
Added support for object lookup by identity
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index b97cd286eda..2165d01d46b 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -85,7 +85,7 @@ Ice::ObjectAdapterI::activate() { _locatorInfo->getLocatorRegistry()->setAdapterDirectProxy(_id, newDirectProxy(ident)); } - catch(const Ice::AdapterNotRegisteredException&) + catch(const Ice::AdapterNotFoundException&) { NotRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "object adapter"; @@ -94,8 +94,7 @@ Ice::ObjectAdapterI::activate() } catch(const Ice::AdapterAlreadyActiveException&) { - AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "object adapter"; + ObjectAdapterIdInUseException ex(__FILE__, __LINE__); ex.id = _id; throw ex; } @@ -313,8 +312,8 @@ Ice::ObjectAdapterI::removeServantLocator(const string& prefix) if(p == _locatorMapHint) { - _locatorMap.erase(p); - _locatorMapHint = ++p; + _locatorMap.erase(p++); + _locatorMapHint = p; } else { |