diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-01-25 11:10:35 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-01-25 11:10:35 +0100 |
| commit | b6aa05f6d0dfae36a7c25a590417b8afeb3f8313 (patch) | |
| tree | 7c283ad6b70f748d8ee699cba8ffb056ac22dac4 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Fixed Python build issue with debug mode (diff) | |
| download | ice-b6aa05f6d0dfae36a7c25a590417b8afeb3f8313.tar.bz2 ice-b6aa05f6d0dfae36a7c25a590417b8afeb3f8313.tar.xz ice-b6aa05f6d0dfae36a7c25a590417b8afeb3f8313.zip | |
Moved the clearing of the router info into the try/catch block (ICE-8615)
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&) |