diff options
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 0b2bb909244..527ee62733c 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -249,21 +249,21 @@ Ice::ObjectAdapterI::deactivate() ICE_NOEXCEPT // facatory list are immutable at this point. // - if(_routerInfo) + try { - // - // Remove entry from the router manager. - // - _instance->routerManager()->erase(_routerInfo->getRouter()); + if(_routerInfo) + { + // + // Remove entry from the router manager. + // + _instance->routerManager()->erase(_routerInfo->getRouter()); - // - // Clear this object adapter with the router. - // - _routerInfo->setAdapter(0); - } + // + // Clear this object adapter with the router. + // + _routerInfo->setAdapter(0); + } - try - { updateLocatorRegistry(_locatorInfo, 0); } catch(const Ice::LocalException&) |