First cut of ICE-6920 - Remove try/catch block around communicator destroy

1 files changed, 2 insertions, 19 deletions

diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 06326032ea2..6d042c73f45 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -354,18 +354,7 @@ Client::main(StringSeq& args)
 
     if(_communicator)
     {
-        try
-        {
-            _communicator->destroy();
-        }
-        catch(const CommunicatorDestroyedException&)
-        {
-        }
-        catch(const Exception& ex)
-        {
-            consoleErr << ex << endl;
-            status = EXIT_FAILURE;
-        }
+        _communicator->destroy();
     }
 
     _ctrlCHandler.setCallback(0);
@@ -392,13 +381,7 @@ Client::interrupted()
         // Otherwise, destroy the communicator.
         //
         assert(_communicator);
-        try
-        {
-            _communicator->destroy();
-        }
-        catch(const Exception&)
-        {
-        }
+        _communicator->destroy();
     }
 }