diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-25 18:42:10 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-25 18:42:10 +0100 |
| commit | 524c89c8c5ea8be6d989c855095cf4c58097e654 (patch) | |
| tree | 697a384847d23d3d84345b84339f42d63d45687a /cpp/src/Glacier2Lib/SessionHelper.cpp | |
| parent | Fixed ICE-7281 - skipEmptyEncapsulation now checks for the encoding version (diff) | |
| download | ice-524c89c8c5ea8be6d989c855095cf4c58097e654.tar.bz2 ice-524c89c8c5ea8be6d989c855095cf4c58097e654.tar.xz ice-524c89c8c5ea8be6d989c855095cf4c58097e654.zip | |
First cut of ICE-6920 - Remove try/catch block around communicator destroy
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 0e52daeba47..9048320f801 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -459,14 +459,7 @@ SessionHelperI::destroyInternal(const Ice::DispatcherCallPtr& disconnected) if(communicator) { - try - { - communicator->destroy(); - } - catch(...) - { - } - communicator = ICE_NULLPTR; + communicator->destroy(); } dispatchCallback(disconnected, ICE_NULLPTR); } @@ -482,14 +475,7 @@ SessionHelperI::destroyCommunicator() if(communicator) { - try - { - communicator->destroy(); - } - catch(...) - { - } - communicator = ICE_NULLPTR; + communicator->destroy(); } } @@ -504,13 +490,7 @@ SessionHelperI::connectFailed() if(communicator) { - try - { - communicator->destroy(); - } - catch(...) - { - } + communicator->destroy(); } } |