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/Ice/Service.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/Ice/Service.cpp')
| -rw-r--r-- | cpp/src/Ice/Service.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index ebbfe4e45c5..58cb55a2d2f 100644 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -883,13 +883,7 @@ Ice::Service::run(int& argc, char* argv[], const InitializationData& initData) if(_communicator) { - try - { - _communicator->destroy(); - } - catch(...) - { - } + _communicator->destroy(); } return status; @@ -1386,14 +1380,8 @@ Ice::Service::serviceMain(int argc, wchar_t* argv[]) delete[] args; - try - { - assert(_communicator); - _communicator->destroy(); - } - catch(...) - { - } + assert(_communicator); + _communicator->destroy(); terminateService(status); } @@ -1883,13 +1871,7 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa if(_communicator) { - try - { - _communicator->destroy(); - } - catch(...) - { - } + _communicator->destroy(); } return status; |