diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-11-25 22:23:00 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-11-25 22:23:00 +0000 |
| commit | e0ac69f7b067964774a5d3d241bc5496564e37ba (patch) | |
| tree | 0db95ebe5daf6d694b80060c79c0cfd6436bfffb /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | more detail for CompressionException (diff) | |
| download | ice-e0ac69f7b067964774a5d3d241bc5496564e37ba.tar.bz2 ice-e0ac69f7b067964774a5d3d241bc5496564e37ba.tar.xz ice-e0ac69f7b067964774a5d3d241bc5496564e37ba.zip | |
- Added Ice.NullHandleAbort property
- Fixed Locator.ice exception names to be consistent with other exceptions.
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index cdc3f5d4535..5504ded919e 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -84,13 +84,13 @@ Ice::ObjectAdapterI::activate() { _locatorInfo->getLocatorRegistry()->setAdapterDirectProxy(_id, newDirectProxy(ident)); } - catch(const Ice::AdapterNotRegistered&) + catch(const Ice::AdapterNotRegisteredException&) { ObjectAdapterNotRegisteredException ex(__FILE__, __LINE__); ex.name = _name; throw ex; } - catch(const Ice::AdapterAlreadyActive&) + catch(const Ice::AdapterAlreadyActiveException&) { ObjectAdapterIdInUseException ex(__FILE__, __LINE__); ex.id = _id; |