diff options
218 files changed, 261 insertions, 1892 deletions
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index 3e092e96f95..447ac923430 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -340,22 +340,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat if(_communicator) { - try - { - _communicator->destroy(); - } - catch(const Ice::LocalException& ex) - { - Error out(getProcessLogger()); - out << _appName << ": " << ex; - status = 1; - } - catch(const exception& ex) - { - Error out(getProcessLogger()); - out << "unknown exception:\n" << ex; - status = 1; - } + _communicator->destroy(); _communicator = 0; } 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(); } } diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 976026dfe45..35adba8549c 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -503,22 +503,7 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD if(_communicator != 0) { - try - { - _communicator->destroy(); - } - catch(const std::exception& ex) - { - Error out(getProcessLogger()); - out << ex; - status = EXIT_FAILURE; - } - catch(...) - { - Error out(getProcessLogger()); - out << "unknown exception"; - status = EXIT_FAILURE; - } + _communicator->destroy(); _communicator = 0; } @@ -580,31 +565,8 @@ Ice::Application::destroyOnInterruptCallback(int signal) _destroyed = true; } - try - { - assert(_communicator != 0); - _communicator->destroy(); - } - catch(const std::exception& ex) - { - Error out(getProcessLogger()); - out << "(while destroying in response to signal " << signal << "): " << ex; - } - catch(const std::string& msg) - { - Error out(getProcessLogger()); - out << "(while destroying in response to signal " << signal << "): " << msg; - } - catch(const char* msg) - { - Error out(getProcessLogger()); - out << "(while destroying in response to signal " << signal << "): " << msg; - } - catch(...) - { - Error out(getProcessLogger()); - out << "(while destroying in response to signal " << signal << "): unknown exception"; - } + assert(_communicator != 0); + _communicator->destroy(); { Mutex::Lock lock(_mutex); @@ -635,31 +597,8 @@ Ice::Application::shutdownOnInterruptCallback(int signal) _interrupted = true; } - try - { - assert(_communicator != 0); - _communicator->shutdown(); - } - catch(const std::exception& ex) - { - Error out(getProcessLogger()); - out << "(while shutting down in response to signal " << signal << "): std::exception: " << ex; - } - catch(const std::string& msg) - { - Error out(getProcessLogger()); - out << "(while shutting down in response to signal " << signal << "): " << msg; - } - catch(const char* msg) - { - Error out(getProcessLogger()); - out << "(while shutting down in response to signal " << signal << "): " << msg; - } - catch(...) - { - Error out(getProcessLogger()); - out << "(while shutting down in response to signal " << signal << "): unknown exception"; - } + assert(_communicator != 0); + _communicator->shutdown(); { Mutex::Lock lock(_mutex); 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; diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index fdae86be07f..6226b7c0a4d 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -676,7 +676,7 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, // xlC warns when casting a void* to function pointer # pragma report(disable, "1540-0216") #endif - + SERVICE_FACTORY factory = reinterpret_cast<SERVICE_FACTORY>(sym); try { @@ -860,17 +860,8 @@ IceBox::ServiceManagerI::stopAll() { removeAdminFacets("IceBox.Service." + info.name + "."); - try - { - info.communicator->destroy(); - info.communicator = 0; - } - catch(const Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception while stopping service " << info.name << ":\n"; - out << ex; - } + info.communicator->destroy(); + info.communicator = 0; } try @@ -1126,17 +1117,7 @@ IceBox::ServiceManagerI::destroyServiceCommunicator(const string& service, const } removeAdminFacets("IceBox.Service." + service + "."); - - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception in shutting down communicator for service " << service << ":\n"; - out << ex; - } + communicator->destroy(); } bool 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(); } } diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp index c4b2e4fe416..c6c6510ef2a 100644 --- a/cpp/test/Ice/background/Client.cpp +++ b/cpp/test/Ice/background/Client.cpp @@ -68,15 +68,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp index b7880e9021f..49b0d9281e9 100644 --- a/cpp/test/Ice/custom/Client.cpp +++ b/cpp/test/Ice/custom/Client.cpp @@ -52,15 +52,7 @@ main(int argc, char** argv) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index 0018ff8e112..dd318ab63a4 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -58,15 +58,7 @@ main(int argc, char** argv) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index 04b9c97ebb2..1eeb89f4f75 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -59,15 +59,7 @@ main(int argc, char** argv) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index bdfed90eaff..3e015fb1d9f 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -59,15 +59,7 @@ main(int argc, char** argv) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp index 397509df120..0cb63da88a3 100644 --- a/cpp/test/Ice/echo/Server.cpp +++ b/cpp/test/Ice/echo/Server.cpp @@ -81,15 +81,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp index b1b0a373914..03d7b818126 100644 --- a/cpp/test/Ice/hash/Client.cpp +++ b/cpp/test/Ice/hash/Client.cpp @@ -102,14 +102,7 @@ int main(int argc, char** argv) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::LocalException& ex) - { - cerr << ex << endl; - } + communicator->destroy(); } return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp index 4776dd942b8..b7c070776ba 100644 --- a/cpp/test/Ice/interceptor/Client.cpp +++ b/cpp/test/Ice/interceptor/Client.cpp @@ -39,14 +39,7 @@ public: { if(_communicator) { - try - { - _communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cout << ex << endl; - } + _communicator->destroy(); } } diff --git a/cpp/test/Ice/invoke/Client.cpp b/cpp/test/Ice/invoke/Client.cpp index 120d3555a98..fc9396328f1 100644 --- a/cpp/test/Ice/invoke/Client.cpp +++ b/cpp/test/Ice/invoke/Client.cpp @@ -52,15 +52,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp index 7bbd28e143b..5f2a8c9dda1 100644 --- a/cpp/test/Ice/invoke/Server.cpp +++ b/cpp/test/Ice/invoke/Server.cpp @@ -135,15 +135,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp index 3d75a924ca6..e88bad86026 100644 --- a/cpp/test/Ice/optional/Server.cpp +++ b/cpp/test/Ice/optional/Server.cpp @@ -52,15 +52,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/optional/ServerAMD.cpp b/cpp/test/Ice/optional/ServerAMD.cpp index ddbc1a2eb28..374e5b64844 100644 --- a/cpp/test/Ice/optional/ServerAMD.cpp +++ b/cpp/test/Ice/optional/ServerAMD.cpp @@ -52,15 +52,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp index c7455d7c012..17e9d7ab6e6 100644 --- a/cpp/test/Ice/stream/Client.cpp +++ b/cpp/test/Ice/stream/Client.cpp @@ -1318,15 +1318,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp index 63248a612ce..95db086e3a5 100644 --- a/cpp/test/Ice/stringConverter/Server.cpp +++ b/cpp/test/Ice/stringConverter/Server.cpp @@ -77,15 +77,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/threadPoolPriority/Client.cpp b/cpp/test/Ice/threadPoolPriority/Client.cpp index 5ca601e09d8..746a44c9426 100644 --- a/cpp/test/Ice/threadPoolPriority/Client.cpp +++ b/cpp/test/Ice/threadPoolPriority/Client.cpp @@ -48,15 +48,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp index 1eed7ce28c4..726552c55db 100644 --- a/cpp/test/Ice/threadPoolPriority/Server.cpp +++ b/cpp/test/Ice/threadPoolPriority/Server.cpp @@ -79,15 +79,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp index 559752de5f9..c2ad85d7578 100644 --- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp +++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp @@ -83,15 +83,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceBox/admin/Client.cpp b/cpp/test/IceBox/admin/Client.cpp index 07b6c88b0c2..5d833403df4 100644 --- a/cpp/test/IceBox/admin/Client.cpp +++ b/cpp/test/IceBox/admin/Client.cpp @@ -51,15 +51,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceBox/configuration/Client.cpp b/cpp/test/IceBox/configuration/Client.cpp index 07b6c88b0c2..5d833403df4 100644 --- a/cpp/test/IceBox/configuration/Client.cpp +++ b/cpp/test/IceBox/configuration/Client.cpp @@ -51,15 +51,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceDiscovery/simple/Client.cpp b/cpp/test/IceDiscovery/simple/Client.cpp index 5a7ceb63473..bf88403572f 100644 --- a/cpp/test/IceDiscovery/simple/Client.cpp +++ b/cpp/test/IceDiscovery/simple/Client.cpp @@ -54,15 +54,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceDiscovery/simple/Server.cpp b/cpp/test/IceDiscovery/simple/Server.cpp index dd694fd3778..862b47cc705 100644 --- a/cpp/test/IceDiscovery/simple/Server.cpp +++ b/cpp/test/IceDiscovery/simple/Server.cpp @@ -73,15 +73,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/activation/Client.cpp b/cpp/test/IceGrid/activation/Client.cpp index f95f7d0e44c..755ebb5d0df 100644 --- a/cpp/test/IceGrid/activation/Client.cpp +++ b/cpp/test/IceGrid/activation/Client.cpp @@ -42,15 +42,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/allocation/Client.cpp b/cpp/test/IceGrid/allocation/Client.cpp index f5cbbb67e8f..7b3907981be 100644 --- a/cpp/test/IceGrid/allocation/Client.cpp +++ b/cpp/test/IceGrid/allocation/Client.cpp @@ -41,15 +41,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/deployer/Client.cpp b/cpp/test/IceGrid/deployer/Client.cpp index b1afe894a0b..f2b5e03a6a7 100644 --- a/cpp/test/IceGrid/deployer/Client.cpp +++ b/cpp/test/IceGrid/deployer/Client.cpp @@ -69,15 +69,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/distribution/Client.cpp b/cpp/test/IceGrid/distribution/Client.cpp index f5cbbb67e8f..7b3907981be 100644 --- a/cpp/test/IceGrid/distribution/Client.cpp +++ b/cpp/test/IceGrid/distribution/Client.cpp @@ -41,15 +41,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/noRestartUpdate/Client.cpp b/cpp/test/IceGrid/noRestartUpdate/Client.cpp index f5cbbb67e8f..7b3907981be 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Client.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Client.cpp @@ -41,15 +41,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/replicaGroup/Client.cpp b/cpp/test/IceGrid/replicaGroup/Client.cpp index 5ca10eeb8c4..f6220ff5ebc 100644 --- a/cpp/test/IceGrid/replicaGroup/Client.cpp +++ b/cpp/test/IceGrid/replicaGroup/Client.cpp @@ -41,15 +41,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/replication/Client.cpp b/cpp/test/IceGrid/replication/Client.cpp index 9fd0d611644..423074550b2 100644 --- a/cpp/test/IceGrid/replication/Client.cpp +++ b/cpp/test/IceGrid/replication/Client.cpp @@ -42,15 +42,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/session/Client.cpp b/cpp/test/IceGrid/session/Client.cpp index bf5487c553b..2a23b6ca700 100644 --- a/cpp/test/IceGrid/session/Client.cpp +++ b/cpp/test/IceGrid/session/Client.cpp @@ -41,15 +41,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/simple/Client.cpp b/cpp/test/IceGrid/simple/Client.cpp index a6a2fe738c0..4d064e6688c 100644 --- a/cpp/test/IceGrid/simple/Client.cpp +++ b/cpp/test/IceGrid/simple/Client.cpp @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceGrid/update/Client.cpp b/cpp/test/IceGrid/update/Client.cpp index f5cbbb67e8f..7b3907981be 100644 --- a/cpp/test/IceGrid/update/Client.cpp +++ b/cpp/test/IceGrid/update/Client.cpp @@ -41,15 +41,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp index 631cefff11e..c198faa0834 100644 --- a/cpp/test/IceSSL/configuration/Client.cpp +++ b/cpp/test/IceSSL/configuration/Client.cpp @@ -84,15 +84,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp index 9b9696d64b3..84cdb4f0f47 100644 --- a/cpp/test/IceSSL/configuration/Server.cpp +++ b/cpp/test/IceSSL/configuration/Server.cpp @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp index befcf51b8dc..3206b426091 100644 --- a/cpp/test/IceStorm/federation/Publisher.cpp +++ b/cpp/test/IceStorm/federation/Publisher.cpp @@ -146,15 +146,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp index 20ef6c29bc8..22aa3393ae0 100644 --- a/cpp/test/IceStorm/federation/Subscriber.cpp +++ b/cpp/test/IceStorm/federation/Subscriber.cpp @@ -210,15 +210,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/federation2/Publisher.cpp b/cpp/test/IceStorm/federation2/Publisher.cpp index c07f3df88c5..4e6c2f09f93 100644 --- a/cpp/test/IceStorm/federation2/Publisher.cpp +++ b/cpp/test/IceStorm/federation2/Publisher.cpp @@ -115,15 +115,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/federation2/Subscriber.cpp b/cpp/test/IceStorm/federation2/Subscriber.cpp index 6bce9c9d84d..ef753880c27 100644 --- a/cpp/test/IceStorm/federation2/Subscriber.cpp +++ b/cpp/test/IceStorm/federation2/Subscriber.cpp @@ -203,15 +203,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/rep1/Publisher.cpp b/cpp/test/IceStorm/rep1/Publisher.cpp index b90f8f7300a..d4607a3940c 100644 --- a/cpp/test/IceStorm/rep1/Publisher.cpp +++ b/cpp/test/IceStorm/rep1/Publisher.cpp @@ -135,15 +135,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/rep1/Sub.cpp b/cpp/test/IceStorm/rep1/Sub.cpp index 55423322069..ff37d271831 100644 --- a/cpp/test/IceStorm/rep1/Sub.cpp +++ b/cpp/test/IceStorm/rep1/Sub.cpp @@ -108,15 +108,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/rep1/Subscriber.cpp b/cpp/test/IceStorm/rep1/Subscriber.cpp index be1b8e0e36c..12241ede92e 100644 --- a/cpp/test/IceStorm/rep1/Subscriber.cpp +++ b/cpp/test/IceStorm/rep1/Subscriber.cpp @@ -200,15 +200,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/repgrid/Client.cpp b/cpp/test/IceStorm/repgrid/Client.cpp index f13afb1cf46..684eebd2001 100644 --- a/cpp/test/IceStorm/repgrid/Client.cpp +++ b/cpp/test/IceStorm/repgrid/Client.cpp @@ -131,15 +131,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/repstress/Control.cpp b/cpp/test/IceStorm/repstress/Control.cpp index c04289cdbad..9e893aaf168 100644 --- a/cpp/test/IceStorm/repstress/Control.cpp +++ b/cpp/test/IceStorm/repstress/Control.cpp @@ -49,15 +49,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/repstress/Publisher.cpp b/cpp/test/IceStorm/repstress/Publisher.cpp index b8a91876a9e..44897685028 100644 --- a/cpp/test/IceStorm/repstress/Publisher.cpp +++ b/cpp/test/IceStorm/repstress/Publisher.cpp @@ -155,15 +155,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/repstress/Subscriber.cpp b/cpp/test/IceStorm/repstress/Subscriber.cpp index 6ac382ce38c..359cbde53f2 100644 --- a/cpp/test/IceStorm/repstress/Subscriber.cpp +++ b/cpp/test/IceStorm/repstress/Subscriber.cpp @@ -146,15 +146,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp index a88dff82add..58a58b3e7fb 100644 --- a/cpp/test/IceStorm/single/Publisher.cpp +++ b/cpp/test/IceStorm/single/Publisher.cpp @@ -83,15 +83,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp index 7b4c0a17351..db3365f4f7c 100644 --- a/cpp/test/IceStorm/single/Subscriber.cpp +++ b/cpp/test/IceStorm/single/Subscriber.cpp @@ -263,15 +263,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/stress/Publisher.cpp b/cpp/test/IceStorm/stress/Publisher.cpp index 7d41977191a..4bc82745653 100644 --- a/cpp/test/IceStorm/stress/Publisher.cpp +++ b/cpp/test/IceStorm/stress/Publisher.cpp @@ -132,15 +132,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp index 1baa978ae3f..d43c2469b28 100644 --- a/cpp/test/IceStorm/stress/Subscriber.cpp +++ b/cpp/test/IceStorm/stress/Subscriber.cpp @@ -529,15 +529,7 @@ main(int argc, char* argv[]) if(communicator) { - try - { - communicator->destroy(); - } - catch(const Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } + communicator->destroy(); } return status; diff --git a/csharp/src/Glacier2/SessionHelper.cs b/csharp/src/Glacier2/SessionHelper.cs index d65b07ebb7e..9f15f0b9662 100644 --- a/csharp/src/Glacier2/SessionHelper.cs +++ b/csharp/src/Glacier2/SessionHelper.cs @@ -361,13 +361,7 @@ public class SessionHelper communicator.getLogger().warning("SessionHelper: unexpected exception when destroying the session:\n" + e); } - try - { - communicator.destroy(); - } - catch(Exception) - { - } + communicator.destroy(); // Notify the callback that the session is gone. dispatchCallback(() => @@ -384,13 +378,8 @@ public class SessionHelper { communicator = _communicator; } - try - { - communicator.destroy(); - } - catch(Exception) - { - } + + communicator.destroy(); } delegate SessionPrx ConnectStrategy(RouterPrx router); @@ -459,13 +448,8 @@ public class SessionHelper } catch(Exception ex) { - try - { - _communicator.destroy(); - } - catch(Exception) - { - } + _communicator.destroy(); + dispatchCallback(() => { _callback.connectFailed(this, ex); diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index 17757974413..51bfb0c47b7 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -990,16 +990,7 @@ class ServiceManagerI : ServiceManagerDisp_ } removeAdminFacets("IceBox.Service." + service + "."); - - try - { - communicator.destroy(); - } - catch(Exception e) - { - _logger.warning("ServiceManager: exception while destroying communicator for service " - + service + "\n" + e.ToString()); - } + communicator.destroy(); } } diff --git a/csharp/test/Ice/hash/Client.cs b/csharp/test/Ice/hash/Client.cs index a1c4aa0165c..6c7fba7c358 100644 --- a/csharp/test/Ice/hash/Client.cs +++ b/csharp/test/Ice/hash/Client.cs @@ -524,15 +524,7 @@ public class Client if(communicator != null) { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - Console.Error.WriteLine(ex); - status = 1; - } + communicator.destroy(); } } catch(Exception ex) diff --git a/csharp/test/Slice/escape/Client.cs b/csharp/test/Slice/escape/Client.cs index 6c0d00d12c1..ec57758db9d 100644 --- a/csharp/test/Slice/escape/Client.cs +++ b/csharp/test/Slice/escape/Client.cs @@ -198,15 +198,7 @@ public class Client if(communicator != null) { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - Console.Error.WriteLine(ex); - status = 1; - } + communicator.destroy(); } return status; diff --git a/csharp/test/Slice/structure/Client.cs b/csharp/test/Slice/structure/Client.cs index ca183624e32..c676a00b9ab 100644 --- a/csharp/test/Slice/structure/Client.cs +++ b/csharp/test/Slice/structure/Client.cs @@ -294,15 +294,7 @@ public class Client if(communicator != null) { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - Console.Error.WriteLine(ex); - status = 1; - } + communicator.destroy(); } return status; diff --git a/csharp/test/TestCommon/TestApp.cs b/csharp/test/TestCommon/TestApp.cs index 330223ca25d..d840b1f40bf 100644 --- a/csharp/test/TestCommon/TestApp.cs +++ b/csharp/test/TestCommon/TestApp.cs @@ -85,15 +85,7 @@ namespace TestCommon if(_communicator != null) { - try - { - _communicator.destroy(); - } - catch(Exception ex) - { - Console.Out.WriteLine(_testName + ": " + ex); - status = 1; - } + _communicator.destroy(); _communicator = null; } return status; diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java b/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java index f5c35d5c86f..b39388666a6 100644 --- a/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java +++ b/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java @@ -469,20 +469,7 @@ public abstract class Application extends Ice.Application if(_communicator != null) { - try - { - _communicator.destroy(); - } - catch(Ice.LocalException ex) - { - Ice.Util.getProcessLogger().error(IceInternal.Ex.toString(ex)); - status.value = 1; - } - catch(java.lang.Exception ex) - { - Ice.Util.getProcessLogger().error("unknown exception:\n" + IceInternal.Ex.toString(ex)); - status.value = 1; - } + _communicator.destroy(); _communicator = null; } diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java index 2b02cabfe29..24a63b3b5db 100644 --- a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java +++ b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java @@ -426,13 +426,7 @@ public class SessionHelper communicator.getLogger().warning("SessionHelper: unexpected exception when destroying the session:\n" + e); } - try - { - communicator.destroy(); - } - catch(Throwable ex) - { - } + communicator.destroy(); // // Notify the callback that the session is gone. @@ -458,13 +452,7 @@ public class SessionHelper if(communicator != null) { - try - { - _communicator.destroy(); - } - catch(Throwable ex) - { - } + communicator.destroy(); } } @@ -552,13 +540,7 @@ public class SessionHelper } catch(final Exception ex) { - try - { - _communicator.destroy(); - } - catch(Throwable ex1) - { - } + _communicator.destroy(); dispatchCallback(new Runnable() { diff --git a/java-compat/test/src/main/java/test/Ice/hash/Client.java b/java-compat/test/src/main/java/test/Ice/hash/Client.java index 12d711fc51a..f1407427e40 100644 --- a/java-compat/test/src/main/java/test/Ice/hash/Client.java +++ b/java-compat/test/src/main/java/test/Ice/hash/Client.java @@ -423,15 +423,7 @@ public class Client extends test.Util.Application if(communicator != null) { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - System.out.println(ex.toString()); - status = 1; - } + communicator.destroy(); } } catch(Exception ex) diff --git a/java-compat/test/src/main/java/test/Ice/throughput/Client.java b/java-compat/test/src/main/java/test/Ice/throughput/Client.java index ea891ac0a0f..247726675a5 100644 --- a/java-compat/test/src/main/java/test/Ice/throughput/Client.java +++ b/java-compat/test/src/main/java/test/Ice/throughput/Client.java @@ -28,14 +28,7 @@ public class Client extends test.Util.Application public void run() { - try - { - communicator().destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - } + communicator().destroy(); } } diff --git a/java-compat/test/src/main/java/test/Slice/escape/Client.java b/java-compat/test/src/main/java/test/Slice/escape/Client.java index 998291e1583..380d82025ac 100644 --- a/java-compat/test/src/main/java/test/Slice/escape/Client.java +++ b/java-compat/test/src/main/java/test/Slice/escape/Client.java @@ -212,15 +212,7 @@ public class Client if(communicator != null) { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } + communicator.destroy(); } System.gc(); diff --git a/java-compat/test/src/main/java/test/Slice/structure/Client.java b/java-compat/test/src/main/java/test/Slice/structure/Client.java index ede1f92c0c8..a4b09ea9891 100644 --- a/java-compat/test/src/main/java/test/Slice/structure/Client.java +++ b/java-compat/test/src/main/java/test/Slice/structure/Client.java @@ -298,15 +298,7 @@ public class Client if(communicator != null) { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } + communicator.destroy(); } System.gc(); diff --git a/java-compat/test/src/main/java/test/Util/Application.java b/java-compat/test/src/main/java/test/Util/Application.java index 7cc08508e3a..30fcbc3d3af 100644 --- a/java-compat/test/src/main/java/test/Util/Application.java +++ b/java-compat/test/src/main/java/test/Util/Application.java @@ -135,22 +135,7 @@ public abstract class Application if(_communicator != null) { - try - { - _communicator.destroy(); - } - catch(LocalException ex) - { - writer.println(_testName + ": " + ex); - ex.printStackTrace(writer); - status = 1; - } - catch(java.lang.Exception ex) - { - writer.println(_testName + ": unknown exception"); - ex.printStackTrace(writer); - status = 1; - } + _communicator.destroy(); _communicator = null; } writer.flush(); diff --git a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java index eabd0cd1443..920a9fa7ca1 100644 --- a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java +++ b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java @@ -455,20 +455,7 @@ public abstract class Application extends com.zeroc.Ice.Application if(_communicator != null) { - try - { - _communicator.destroy(); - } - catch(com.zeroc.Ice.LocalException ex) - { - Util.getProcessLogger().error(Ex.toString(ex)); - r.returnValue = 1; - } - catch(java.lang.Exception ex) - { - Util.getProcessLogger().error("unknown exception:\n" + Ex.toString(ex)); - r.returnValue = 1; - } + _communicator.destroy(); _communicator = null; } diff --git a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java index 275efda4e0c..17767b0234a 100644 --- a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java +++ b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java @@ -410,13 +410,7 @@ public class SessionHelper communicator.getLogger().warning("SessionHelper: unexpected exception when destroying the session:\n" + e); } - try - { - communicator.destroy(); - } - catch(Throwable ex) - { - } + communicator.destroy(); // // Notify the callback that the session is gone. @@ -441,13 +435,7 @@ public class SessionHelper if(communicator != null) { - try - { - _communicator.destroy(); - } - catch(Throwable ex) - { - } + _communicator.destroy(); } } @@ -535,13 +523,7 @@ public class SessionHelper } catch(final Exception ex) { - try - { - _communicator.destroy(); - } - catch(Throwable ex1) - { - } + _communicator.destroy(); dispatchCallback(new Runnable() { diff --git a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java index 17ec55be0db..f2c60fcf1f7 100644 --- a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java @@ -1095,20 +1095,7 @@ public class ServiceManagerI implements ServiceManager } removeAdminFacets("IceBox.Service." + service + "."); - - try - { - communicator.destroy(); - } - catch(java.lang.Exception e) - { - java.io.StringWriter sw = new java.io.StringWriter(); - java.io.PrintWriter pw = new java.io.PrintWriter(sw); - e.printStackTrace(pw); - pw.flush(); - _logger.warning("ServiceManager: exception in destroying communicator for service " - + service + "\n" + sw.toString()); - } + communicator.destroy(); } private boolean configureAdmin(Properties properties, String prefix) diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java index 3de6a71c136..1802757ac1e 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java @@ -3376,13 +3376,7 @@ public class Coordinator { if(_communicator != null) { - try - { - _communicator.destroy(); - } - catch(com.zeroc.Ice.LocalException e) - { - } + _communicator.destroy(); _communicator = null; } } diff --git a/java/test/src/main/java/test/Ice/hash/Client.java b/java/test/src/main/java/test/Ice/hash/Client.java index 4a6756bd2f2..5912ba800c6 100644 --- a/java/test/src/main/java/test/Ice/hash/Client.java +++ b/java/test/src/main/java/test/Ice/hash/Client.java @@ -63,8 +63,8 @@ public class Client extends test.Util.Application out.flush(); { java.util.Random rand = new java.util.Random(); - for(i = 0; proxyCollisions < maxCollisions && - endpointCollisions < maxCollisions && + for(i = 0; proxyCollisions < maxCollisions && + endpointCollisions < maxCollisions && i < maxIterations; ++i) { java.io.StringWriter sw = new java.io.StringWriter(); @@ -93,7 +93,7 @@ public class Client extends test.Util.Application { seenProxy.put(obj.hashCode(), obj); } - + java.util.Iterator<Endpoint> j = endpoints.iterator(); while(j.hasNext()) { @@ -125,8 +125,8 @@ public class Client extends test.Util.Application proxyCollisions = 0; seenProxy = new java.util.HashMap<>(); - for(i = 0; proxyCollisions < maxCollisions && - endpointCollisions < maxCollisions && + for(i = 0; proxyCollisions < maxCollisions && + endpointCollisions < maxCollisions && i < maxIterations; ++i) { java.io.StringWriter sw = new java.io.StringWriter(); @@ -158,8 +158,8 @@ public class Client extends test.Util.Application proxyCollisions = 0; seenProxy = new java.util.HashMap<>(); - for(i = 0; proxyCollisions < maxCollisions && - endpointCollisions < maxCollisions && + for(i = 0; proxyCollisions < maxCollisions && + endpointCollisions < maxCollisions && i < maxIterations; ++i) { java.io.StringWriter sw = new java.io.StringWriter(); @@ -404,7 +404,7 @@ public class Client extends test.Util.Application test(c.hashCode() == c.hashCode()); } test(structCollisions < maxCollisions); - + structCollisions = 0; java.util.Map<Integer, Draw> seenDraw = new java.util.HashMap<>(); structCollisions = 0; @@ -412,7 +412,7 @@ public class Client extends test.Util.Application { Draw draw = new Draw( new Color(rand.nextInt(255), rand.nextInt(255), rand.nextInt(255), rand.nextInt(255)), - new Pen(rand.nextInt(10), + new Pen(rand.nextInt(10), new Color(rand.nextInt(255), rand.nextInt(255), rand.nextInt(255), rand.nextInt(255))), false); @@ -437,18 +437,10 @@ public class Client extends test.Util.Application test(structCollisions < maxCollisions); } out.println("ok"); - + if(communicator != null) { - try - { - communicator.destroy(); - } - catch(com.zeroc.Ice.LocalException ex) - { - System.out.println(ex.toString()); - status = 1; - } + communicator.destroy(); } } catch(Exception ex) diff --git a/java/test/src/main/java/test/Ice/throughput/Client.java b/java/test/src/main/java/test/Ice/throughput/Client.java index b7234143425..fb529dbdbb2 100644 --- a/java/test/src/main/java/test/Ice/throughput/Client.java +++ b/java/test/src/main/java/test/Ice/throughput/Client.java @@ -26,14 +26,7 @@ public class Client extends test.Util.Application @Override public void run() { - try - { - communicator().destroy(); - } - catch(com.zeroc.Ice.LocalException ex) - { - ex.printStackTrace(); - } + communicator().destroy(); } } diff --git a/java/test/src/main/java/test/Slice/escape/Client.java b/java/test/src/main/java/test/Slice/escape/Client.java index 5a032c09f49..7898743255a 100644 --- a/java/test/src/main/java/test/Slice/escape/Client.java +++ b/java/test/src/main/java/test/Slice/escape/Client.java @@ -199,15 +199,7 @@ public class Client if(communicator != null) { - try - { - communicator.destroy(); - } - catch(com.zeroc.Ice.LocalException ex) - { - ex.printStackTrace(); - status = 1; - } + communicator.destroy(); } System.gc(); diff --git a/java/test/src/main/java/test/Util/Application.java b/java/test/src/main/java/test/Util/Application.java index d9e7a56b31b..73f49b04ff9 100644 --- a/java/test/src/main/java/test/Util/Application.java +++ b/java/test/src/main/java/test/Util/Application.java @@ -138,22 +138,7 @@ public abstract class Application if(_communicator != null) { - try - { - _communicator.destroy(); - } - catch(LocalException ex) - { - writer.println(_testName + ": " + ex); - ex.printStackTrace(writer); - status = 1; - } - catch(java.lang.Exception ex) - { - writer.println(_testName + ": unknown exception"); - ex.printStackTrace(writer); - status = 1; - } + _communicator.destroy(); _communicator = null; } writer.flush(); diff --git a/objective-c/test/Ice/acm/Client.m b/objective-c/test/Ice/acm/Client.m index 8e576fa5961..454c195f13e 100644 --- a/objective-c/test/Ice/acm/Client.m +++ b/objective-c/test/Ice/acm/Client.m @@ -63,15 +63,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/acm/Server.m b/objective-c/test/Ice/acm/Server.m index 1c945179a57..19bec1af80f 100644 --- a/objective-c/test/Ice/acm/Server.m +++ b/objective-c/test/Ice/acm/Server.m @@ -72,15 +72,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } return status; } diff --git a/objective-c/test/Ice/adapterDeactivation/Client.m b/objective-c/test/Ice/adapterDeactivation/Client.m index 8acb4de3b3b..6e156f945f5 100644 --- a/objective-c/test/Ice/adapterDeactivation/Client.m +++ b/objective-c/test/Ice/adapterDeactivation/Client.m @@ -62,15 +62,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/adapterDeactivation/Collocated.m b/objective-c/test/Ice/adapterDeactivation/Collocated.m index 330b0718c6d..4a8fac79095 100644 --- a/objective-c/test/Ice/adapterDeactivation/Collocated.m +++ b/objective-c/test/Ice/adapterDeactivation/Collocated.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/adapterDeactivation/Server.m b/objective-c/test/Ice/adapterDeactivation/Server.m index 739edb66818..b6db9f98f33 100644 --- a/objective-c/test/Ice/adapterDeactivation/Server.m +++ b/objective-c/test/Ice/adapterDeactivation/Server.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/admin/Client.m b/objective-c/test/Ice/admin/Client.m index 7ab68be1529..952447aacda 100644 --- a/objective-c/test/Ice/admin/Client.m +++ b/objective-c/test/Ice/admin/Client.m @@ -61,15 +61,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/admin/Server.m b/objective-c/test/Ice/admin/Server.m index 338def448e2..eb21610417f 100644 --- a/objective-c/test/Ice/admin/Server.m +++ b/objective-c/test/Ice/admin/Server.m @@ -68,15 +68,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } return status; } diff --git a/objective-c/test/Ice/ami/Client.m b/objective-c/test/Ice/ami/Client.m index a0292f93ca4..bcced030ac7 100644 --- a/objective-c/test/Ice/ami/Client.m +++ b/objective-c/test/Ice/ami/Client.m @@ -79,15 +79,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/ami/Collocated.m b/objective-c/test/Ice/ami/Collocated.m index d32c022250e..921e65c7833 100644 --- a/objective-c/test/Ice/ami/Collocated.m +++ b/objective-c/test/Ice/ami/Collocated.m @@ -76,15 +76,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m index 6d142d78216..43007c01b26 100644 --- a/objective-c/test/Ice/ami/Server.m +++ b/objective-c/test/Ice/ami/Server.m @@ -82,15 +82,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/binding/Client.m b/objective-c/test/Ice/binding/Client.m index a302ad5170d..e63a71b8af8 100644 --- a/objective-c/test/Ice/binding/Client.m +++ b/objective-c/test/Ice/binding/Client.m @@ -61,15 +61,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/binding/Server.m b/objective-c/test/Ice/binding/Server.m index 64c6d190aa2..cfe75acae82 100644 --- a/objective-c/test/Ice/binding/Server.m +++ b/objective-c/test/Ice/binding/Server.m @@ -67,15 +67,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } return status; } diff --git a/objective-c/test/Ice/defaultServant/Client.m b/objective-c/test/Ice/defaultServant/Client.m index 408663eef3b..f85bca08708 100644 --- a/objective-c/test/Ice/defaultServant/Client.m +++ b/objective-c/test/Ice/defaultServant/Client.m @@ -187,15 +187,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/dispatcher/Client.m b/objective-c/test/Ice/dispatcher/Client.m index 068ce6bdd99..c95e519c79a 100644 --- a/objective-c/test/Ice/dispatcher/Client.m +++ b/objective-c/test/Ice/dispatcher/Client.m @@ -71,15 +71,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/dispatcher/Collocated.m b/objective-c/test/Ice/dispatcher/Collocated.m index 949e17818fd..1a5ca06cb8a 100644 --- a/objective-c/test/Ice/dispatcher/Collocated.m +++ b/objective-c/test/Ice/dispatcher/Collocated.m @@ -81,15 +81,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/dispatcher/Server.m b/objective-c/test/Ice/dispatcher/Server.m index afcde81680e..9714920f8df 100644 --- a/objective-c/test/Ice/dispatcher/Server.m +++ b/objective-c/test/Ice/dispatcher/Server.m @@ -81,15 +81,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/enums/Client.m b/objective-c/test/Ice/enums/Client.m index 45282603c7d..4fd80ffcbdf 100644 --- a/objective-c/test/Ice/enums/Client.m +++ b/objective-c/test/Ice/enums/Client.m @@ -65,15 +65,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/enums/Server.m b/objective-c/test/Ice/enums/Server.m index 2e3d3da479b..d106cc663a4 100644 --- a/objective-c/test/Ice/enums/Server.m +++ b/objective-c/test/Ice/enums/Server.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/exceptions/Client.m b/objective-c/test/Ice/exceptions/Client.m index 7550a04ce62..59120cc77fa 100644 --- a/objective-c/test/Ice/exceptions/Client.m +++ b/objective-c/test/Ice/exceptions/Client.m @@ -65,15 +65,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/exceptions/Collocated.m b/objective-c/test/Ice/exceptions/Collocated.m index 1f8fa2cf402..9afa9b810d1 100644 --- a/objective-c/test/Ice/exceptions/Collocated.m +++ b/objective-c/test/Ice/exceptions/Collocated.m @@ -70,15 +70,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/exceptions/Server.m b/objective-c/test/Ice/exceptions/Server.m index db4ddee5189..a2457efc98e 100644 --- a/objective-c/test/Ice/exceptions/Server.m +++ b/objective-c/test/Ice/exceptions/Server.m @@ -82,15 +82,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/facets/Client.m b/objective-c/test/Ice/facets/Client.m index b4d7556b5b0..c8f076ff5b5 100644 --- a/objective-c/test/Ice/facets/Client.m +++ b/objective-c/test/Ice/facets/Client.m @@ -63,15 +63,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/facets/Collocated.m b/objective-c/test/Ice/facets/Collocated.m index f8cba20c264..26e97793857 100644 --- a/objective-c/test/Ice/facets/Collocated.m +++ b/objective-c/test/Ice/facets/Collocated.m @@ -68,15 +68,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/facets/Server.m b/objective-c/test/Ice/facets/Server.m index 7588c29ef83..8055d597c23 100644 --- a/objective-c/test/Ice/facets/Server.m +++ b/objective-c/test/Ice/facets/Server.m @@ -71,15 +71,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/faultTolerance/Client.m b/objective-c/test/Ice/faultTolerance/Client.m index cef9601ca27..4a1a20b5869 100644 --- a/objective-c/test/Ice/faultTolerance/Client.m +++ b/objective-c/test/Ice/faultTolerance/Client.m @@ -92,15 +92,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - NSLog(@"%@", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/faultTolerance/Server.m b/objective-c/test/Ice/faultTolerance/Server.m index d3e3f2c5b2b..a8830bb9dbe 100644 --- a/objective-c/test/Ice/faultTolerance/Server.m +++ b/objective-c/test/Ice/faultTolerance/Server.m @@ -97,15 +97,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - NSLog(@"%@", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/hold/Client.m b/objective-c/test/Ice/hold/Client.m index 1e4cfa91fcd..445e06e4264 100644 --- a/objective-c/test/Ice/hold/Client.m +++ b/objective-c/test/Ice/hold/Client.m @@ -62,15 +62,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/hold/Server.m b/objective-c/test/Ice/hold/Server.m index 2efc0347d89..8740d60c32b 100644 --- a/objective-c/test/Ice/hold/Server.m +++ b/objective-c/test/Ice/hold/Server.m @@ -82,15 +82,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } return status; } diff --git a/objective-c/test/Ice/info/Client.m b/objective-c/test/Ice/info/Client.m index aa61386a351..c7c7c22dc82 100644 --- a/objective-c/test/Ice/info/Client.m +++ b/objective-c/test/Ice/info/Client.m @@ -65,15 +65,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/info/Server.m b/objective-c/test/Ice/info/Server.m index 594ef989f0d..06b7ced2e6f 100644 --- a/objective-c/test/Ice/info/Server.m +++ b/objective-c/test/Ice/info/Server.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/inheritance/Client.m b/objective-c/test/Ice/inheritance/Client.m index 3bb3e39b235..b2e44f403da 100644 --- a/objective-c/test/Ice/inheritance/Client.m +++ b/objective-c/test/Ice/inheritance/Client.m @@ -63,15 +63,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/inheritance/Collocated.m b/objective-c/test/Ice/inheritance/Collocated.m index 1cb3b0c536f..adc7cf731f9 100644 --- a/objective-c/test/Ice/inheritance/Collocated.m +++ b/objective-c/test/Ice/inheritance/Collocated.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/inheritance/Server.m b/objective-c/test/Ice/inheritance/Server.m index f8b92ef6723..b8fc5acbcc1 100644 --- a/objective-c/test/Ice/inheritance/Server.m +++ b/objective-c/test/Ice/inheritance/Server.m @@ -65,15 +65,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/interceptor/Client.m b/objective-c/test/Ice/interceptor/Client.m index 857c2a2c1c7..383c6e78237 100644 --- a/objective-c/test/Ice/interceptor/Client.m +++ b/objective-c/test/Ice/interceptor/Client.m @@ -147,15 +147,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/invoke/Client.m b/objective-c/test/Ice/invoke/Client.m index 1bf452938d1..ae12295160d 100644 --- a/objective-c/test/Ice/invoke/Client.m +++ b/objective-c/test/Ice/invoke/Client.m @@ -63,15 +63,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/invoke/Server.m b/objective-c/test/Ice/invoke/Server.m index 5dcf14febcd..9b34de51851 100644 --- a/objective-c/test/Ice/invoke/Server.m +++ b/objective-c/test/Ice/invoke/Server.m @@ -63,15 +63,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/location/Client.m b/objective-c/test/Ice/location/Client.m index 0841ff1c1a4..01f7baba10e 100644 --- a/objective-c/test/Ice/location/Client.m +++ b/objective-c/test/Ice/location/Client.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/location/Server.m b/objective-c/test/Ice/location/Server.m index 7f7a7bcda2e..3f926127994 100644 --- a/objective-c/test/Ice/location/Server.m +++ b/objective-c/test/Ice/location/Server.m @@ -91,15 +91,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/metrics/Client.m b/objective-c/test/Ice/metrics/Client.m index 2e1d65f4e54..70797504df9 100644 --- a/objective-c/test/Ice/metrics/Client.m +++ b/objective-c/test/Ice/metrics/Client.m @@ -74,15 +74,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/metrics/Server.m b/objective-c/test/Ice/metrics/Server.m index 27e686828ac..9811a4f62e6 100644 --- a/objective-c/test/Ice/metrics/Server.m +++ b/objective-c/test/Ice/metrics/Server.m @@ -84,15 +84,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/objects/Client.m b/objective-c/test/Ice/objects/Client.m index 0f686900fe2..c3bfd26fde1 100644 --- a/objective-c/test/Ice/objects/Client.m +++ b/objective-c/test/Ice/objects/Client.m @@ -143,15 +143,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/objects/Collocated.m b/objective-c/test/Ice/objects/Collocated.m index a21d8ff0305..46612e9d41e 100644 --- a/objective-c/test/Ice/objects/Collocated.m +++ b/objective-c/test/Ice/objects/Collocated.m @@ -149,15 +149,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/objects/Server.m b/objective-c/test/Ice/objects/Server.m index 3d887d38fc7..d1282471204 100644 --- a/objective-c/test/Ice/objects/Server.m +++ b/objective-c/test/Ice/objects/Server.m @@ -97,15 +97,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/operations/Client.m b/objective-c/test/Ice/operations/Client.m index 0195b437667..569e98c4106 100644 --- a/objective-c/test/Ice/operations/Client.m +++ b/objective-c/test/Ice/operations/Client.m @@ -90,15 +90,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/operations/Collocated.m b/objective-c/test/Ice/operations/Collocated.m index 2f72c5527ef..1a6bb036962 100644 --- a/objective-c/test/Ice/operations/Collocated.m +++ b/objective-c/test/Ice/operations/Collocated.m @@ -69,15 +69,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } diff --git a/objective-c/test/Ice/operations/Server.m b/objective-c/test/Ice/operations/Server.m index a293955b116..965b3323835 100644 --- a/objective-c/test/Ice/operations/Server.m +++ b/objective-c/test/Ice/operations/Server.m @@ -72,15 +72,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } diff --git a/objective-c/test/Ice/optional/Client.m b/objective-c/test/Ice/optional/Client.m index b44bb605462..b0b3206ef1f 100644 --- a/objective-c/test/Ice/optional/Client.m +++ b/objective-c/test/Ice/optional/Client.m @@ -62,15 +62,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/optional/Server.m b/objective-c/test/Ice/optional/Server.m index b847b1c4628..d9655788140 100644 --- a/objective-c/test/Ice/optional/Server.m +++ b/objective-c/test/Ice/optional/Server.m @@ -64,15 +64,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/proxy/Client.m b/objective-c/test/Ice/proxy/Client.m index ddd23f86e1d..64d46ec21a5 100644 --- a/objective-c/test/Ice/proxy/Client.m +++ b/objective-c/test/Ice/proxy/Client.m @@ -65,15 +65,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/proxy/Collocated.m b/objective-c/test/Ice/proxy/Collocated.m index dec57165de0..e51d628a2da 100644 --- a/objective-c/test/Ice/proxy/Collocated.m +++ b/objective-c/test/Ice/proxy/Collocated.m @@ -66,15 +66,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/proxy/Server.m b/objective-c/test/Ice/proxy/Server.m index 37c460f2880..37d2931729f 100644 --- a/objective-c/test/Ice/proxy/Server.m +++ b/objective-c/test/Ice/proxy/Server.m @@ -66,15 +66,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/retry/Client.m b/objective-c/test/Ice/retry/Client.m index 7fb888b1d2b..52d8d38e1ee 100644 --- a/objective-c/test/Ice/retry/Client.m +++ b/objective-c/test/Ice/retry/Client.m @@ -72,15 +72,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/retry/Collocated.m b/objective-c/test/Ice/retry/Collocated.m index 71777e52f0c..490562fd0f9 100644 --- a/objective-c/test/Ice/retry/Collocated.m +++ b/objective-c/test/Ice/retry/Collocated.m @@ -68,15 +68,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/retry/Server.m b/objective-c/test/Ice/retry/Server.m index 405107ae094..6e9239034a8 100644 --- a/objective-c/test/Ice/retry/Server.m +++ b/objective-c/test/Ice/retry/Server.m @@ -66,15 +66,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/servantLocator/Client.m b/objective-c/test/Ice/servantLocator/Client.m index 2473e5a94de..04ff9001c78 100644 --- a/objective-c/test/Ice/servantLocator/Client.m +++ b/objective-c/test/Ice/servantLocator/Client.m @@ -62,15 +62,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/servantLocator/Collocated.m b/objective-c/test/Ice/servantLocator/Collocated.m index 6acd8cc00d7..0b9bd9268fa 100644 --- a/objective-c/test/Ice/servantLocator/Collocated.m +++ b/objective-c/test/Ice/servantLocator/Collocated.m @@ -114,15 +114,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } return status; } diff --git a/objective-c/test/Ice/servantLocator/Server.m b/objective-c/test/Ice/servantLocator/Server.m index cf879eac323..653e0f838d2 100644 --- a/objective-c/test/Ice/servantLocator/Server.m +++ b/objective-c/test/Ice/servantLocator/Server.m @@ -115,15 +115,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } return status; } diff --git a/objective-c/test/Ice/services/Client.m b/objective-c/test/Ice/services/Client.m index cd9301e0fb9..326dfcb1b3f 100644 --- a/objective-c/test/Ice/services/Client.m +++ b/objective-c/test/Ice/services/Client.m @@ -62,15 +62,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/slicing/exceptions/Client.m b/objective-c/test/Ice/slicing/exceptions/Client.m index 74e706f204f..2fcbb35a02d 100644 --- a/objective-c/test/Ice/slicing/exceptions/Client.m +++ b/objective-c/test/Ice/slicing/exceptions/Client.m @@ -62,15 +62,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/slicing/exceptions/Server.m b/objective-c/test/Ice/slicing/exceptions/Server.m index 5260dd99953..bd6783de581 100644 --- a/objective-c/test/Ice/slicing/exceptions/Server.m +++ b/objective-c/test/Ice/slicing/exceptions/Server.m @@ -66,15 +66,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/slicing/objects/Client.m b/objective-c/test/Ice/slicing/objects/Client.m index 79c5f6907df..eb0d1ea9822 100644 --- a/objective-c/test/Ice/slicing/objects/Client.m +++ b/objective-c/test/Ice/slicing/objects/Client.m @@ -63,15 +63,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/slicing/objects/Server.m b/objective-c/test/Ice/slicing/objects/Server.m index db17f75ad71..6580bbc3df2 100644 --- a/objective-c/test/Ice/slicing/objects/Server.m +++ b/objective-c/test/Ice/slicing/objects/Server.m @@ -68,15 +68,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/stream/Client.m b/objective-c/test/Ice/stream/Client.m index 8e82f2de1b8..0efc41ef868 100644 --- a/objective-c/test/Ice/stream/Client.m +++ b/objective-c/test/Ice/stream/Client.m @@ -959,15 +959,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/timeout/Client.m b/objective-c/test/Ice/timeout/Client.m index 766275eaa86..bb301e77877 100644 --- a/objective-c/test/Ice/timeout/Client.m +++ b/objective-c/test/Ice/timeout/Client.m @@ -85,15 +85,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m index 2c215c15f9f..7298049b10e 100644 --- a/objective-c/test/Ice/timeout/Server.m +++ b/objective-c/test/Ice/timeout/Server.m @@ -83,15 +83,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/objective-c/test/Slice/escape/Client.m b/objective-c/test/Slice/escape/Client.m index 604618c2ae7..07b9055cd9f 100644 --- a/objective-c/test/Slice/escape/Client.m +++ b/objective-c/test/Slice/escape/Client.m @@ -205,15 +205,7 @@ main(int argc, char* argv[]) if(communicator) { - @try - { - [communicator destroy]; - } - @catch(ICEException* ex) - { - tprintf("%@\n", ex); - status = EXIT_FAILURE; - } + [communicator destroy]; } } return status; diff --git a/python/test/Ice/acm/Client.py b/python/test/Ice/acm/Client.py index b14e5063ddd..8e9586ab9f7 100755 --- a/python/test/Ice/acm/Client.py +++ b/python/test/Ice/acm/Client.py @@ -39,10 +39,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/acm/Server.py b/python/test/Ice/acm/Server.py index 78f2486754b..2db5b7dece5 100755 --- a/python/test/Ice/acm/Server.py +++ b/python/test/Ice/acm/Server.py @@ -44,10 +44,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/admin/Client.py b/python/test/Ice/admin/Client.py index 04d5e65ea29..8ad8e0d5fe3 100644 --- a/python/test/Ice/admin/Client.py +++ b/python/test/Ice/admin/Client.py @@ -35,10 +35,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/admin/Server.py b/python/test/Ice/admin/Server.py index ebdd142b967..50b762fc9ec 100644 --- a/python/test/Ice/admin/Server.py +++ b/python/test/Ice/admin/Server.py @@ -37,10 +37,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/ami/Client.py b/python/test/Ice/ami/Client.py index f09179c2893..d3a0275ffe2 100755 --- a/python/test/Ice/ami/Client.py +++ b/python/test/Ice/ami/Client.py @@ -47,10 +47,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/ami/Collocated.py b/python/test/Ice/ami/Collocated.py index 062ff31f8fb..8336b26a3d9 100755 --- a/python/test/Ice/ami/Collocated.py +++ b/python/test/Ice/ami/Collocated.py @@ -31,7 +31,7 @@ def run(args, communicator): adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test")) #adapter.activate() # Collocated test doesn't need to active the OA - + adapter2.add(testController, Ice.stringToIdentity("testController")) #adapter2.activate() # Collocated test doesn't need to active the OA @@ -57,10 +57,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/ami/Server.py b/python/test/Ice/ami/Server.py index a1c51251af5..c98543c93b2 100755 --- a/python/test/Ice/ami/Server.py +++ b/python/test/Ice/ami/Server.py @@ -59,10 +59,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/binding/Client.py b/python/test/Ice/binding/Client.py index 4f30e65f8e9..c702a3752da 100755 --- a/python/test/Ice/binding/Client.py +++ b/python/test/Ice/binding/Client.py @@ -27,10 +27,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/binding/Server.py b/python/test/Ice/binding/Server.py index e86495fecc4..5cfa8e9a7df 100755 --- a/python/test/Ice/binding/Server.py +++ b/python/test/Ice/binding/Server.py @@ -32,10 +32,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/blobject/Client.py b/python/test/Ice/blobject/Client.py index c485d03acba..ce25b994c8c 100755 --- a/python/test/Ice/blobject/Client.py +++ b/python/test/Ice/blobject/Client.py @@ -64,11 +64,7 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() if status: try: diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py index 9acab682de3..491f0ba9d8e 100755 --- a/python/test/Ice/blobject/Server.py +++ b/python/test/Ice/blobject/Server.py @@ -54,10 +54,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/checksum/Client.py b/python/test/Ice/checksum/Client.py index b2806461ae4..ac14ef4820a 100755 --- a/python/test/Ice/checksum/Client.py +++ b/python/test/Ice/checksum/Client.py @@ -32,10 +32,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py index 0f323f7e077..f2a074ad219 100755 --- a/python/test/Ice/checksum/Server.py +++ b/python/test/Ice/checksum/Server.py @@ -43,10 +43,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/custom/Client.py b/python/test/Ice/custom/Client.py index d65f317b0b5..31d6c9f0d7c 100755 --- a/python/test/Ice/custom/Client.py +++ b/python/test/Ice/custom/Client.py @@ -27,10 +27,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py index 46d1a70cda0..12621d40ca9 100755 --- a/python/test/Ice/custom/Server.py +++ b/python/test/Ice/custom/Server.py @@ -106,10 +106,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/defaultServant/Client.py b/python/test/Ice/defaultServant/Client.py index 4f30e65f8e9..c702a3752da 100755 --- a/python/test/Ice/defaultServant/Client.py +++ b/python/test/Ice/defaultServant/Client.py @@ -27,10 +27,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/enums/Client.py b/python/test/Ice/enums/Client.py index dcecb8bde02..cc50301dbf1 100755 --- a/python/test/Ice/enums/Client.py +++ b/python/test/Ice/enums/Client.py @@ -27,10 +27,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py index 2c6c8292a16..40cc8eb8d7f 100755 --- a/python/test/Ice/enums/Server.py +++ b/python/test/Ice/enums/Server.py @@ -63,10 +63,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/exceptions/Client.py b/python/test/Ice/exceptions/Client.py index 2febe36476c..a721c09b5e5 100755 --- a/python/test/Ice/exceptions/Client.py +++ b/python/test/Ice/exceptions/Client.py @@ -36,10 +36,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py index b1dc368a161..555805a08db 100755 --- a/python/test/Ice/exceptions/Collocated.py +++ b/python/test/Ice/exceptions/Collocated.py @@ -43,10 +43,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py index a3556e7f439..3cb70a97161 100755 --- a/python/test/Ice/exceptions/Server.py +++ b/python/test/Ice/exceptions/Server.py @@ -51,10 +51,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py index ef4511a383b..21238afdcf8 100755 --- a/python/test/Ice/exceptions/ServerAMD.py +++ b/python/test/Ice/exceptions/ServerAMD.py @@ -182,10 +182,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/facets/Client.py b/python/test/Ice/facets/Client.py index 79389c9dfb6..07b46c03e43 100755 --- a/python/test/Ice/facets/Client.py +++ b/python/test/Ice/facets/Client.py @@ -28,10 +28,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py index 5936768fbdc..7b0734c6801 100755 --- a/python/test/Ice/facets/Collocated.py +++ b/python/test/Ice/facets/Collocated.py @@ -39,10 +39,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/facets/Server.py b/python/test/Ice/facets/Server.py index e00238e0834..293b1a24bdc 100755 --- a/python/test/Ice/facets/Server.py +++ b/python/test/Ice/facets/Server.py @@ -38,10 +38,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/faultTolerance/Client.py b/python/test/Ice/faultTolerance/Client.py index 8c5b02bdebc..2148c01553b 100755 --- a/python/test/Ice/faultTolerance/Client.py +++ b/python/test/Ice/faultTolerance/Client.py @@ -58,10 +58,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py index e0f0a1e4cdc..6e4b6fe0fc4 100755 --- a/python/test/Ice/faultTolerance/Server.py +++ b/python/test/Ice/faultTolerance/Server.py @@ -76,10 +76,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/info/Client.py b/python/test/Ice/info/Client.py index 2c33651a220..8d395d34d36 100755 --- a/python/test/Ice/info/Client.py +++ b/python/test/Ice/info/Client.py @@ -37,10 +37,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/info/Server.py b/python/test/Ice/info/Server.py index 1c6057ce26c..63dfac1ebd0 100755 --- a/python/test/Ice/info/Server.py +++ b/python/test/Ice/info/Server.py @@ -37,10 +37,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/inheritance/Client.py b/python/test/Ice/inheritance/Client.py index af8035a4634..5d978d0bb61 100755 --- a/python/test/Ice/inheritance/Client.py +++ b/python/test/Ice/inheritance/Client.py @@ -27,10 +27,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/inheritance/Collocated.py b/python/test/Ice/inheritance/Collocated.py index cca4200f26e..5fd18d1b4c6 100755 --- a/python/test/Ice/inheritance/Collocated.py +++ b/python/test/Ice/inheritance/Collocated.py @@ -33,10 +33,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/inheritance/Server.py b/python/test/Ice/inheritance/Server.py index 3415ad4519d..027ff3b5e80 100755 --- a/python/test/Ice/inheritance/Server.py +++ b/python/test/Ice/inheritance/Server.py @@ -31,10 +31,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/location/Client.py b/python/test/Ice/location/Client.py index affc95ee1ff..71418f137a6 100755 --- a/python/test/Ice/location/Client.py +++ b/python/test/Ice/location/Client.py @@ -38,10 +38,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py index debd8d06d28..b9e8f55e9ad 100755 --- a/python/test/Ice/location/Server.py +++ b/python/test/Ice/location/Server.py @@ -89,7 +89,7 @@ class ServerManagerI(Test.ServerManager): self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2") def startServer(self, current=None): - + # # Simulate a server: create a new communicator and object # adapter. The object adapter is started on a system allocated @@ -190,10 +190,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/objects/Client.py b/python/test/Ice/objects/Client.py index 3f840b93b3c..6cd16ce186d 100755 --- a/python/test/Ice/objects/Client.py +++ b/python/test/Ice/objects/Client.py @@ -28,10 +28,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py index 02570bc35a9..ca2c54b22bc 100755 --- a/python/test/Ice/objects/Collocated.py +++ b/python/test/Ice/objects/Collocated.py @@ -39,10 +39,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py index 89b440c6845..b986603ccdf 100755 --- a/python/test/Ice/objects/Server.py +++ b/python/test/Ice/objects/Server.py @@ -47,10 +47,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/operations/Client.py b/python/test/Ice/operations/Client.py index 285ab3a40d3..650cc34ebf3 100755 --- a/python/test/Ice/operations/Client.py +++ b/python/test/Ice/operations/Client.py @@ -56,10 +56,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/operations/Collocated.py b/python/test/Ice/operations/Collocated.py index 757d5089247..02d35848c0c 100755 --- a/python/test/Ice/operations/Collocated.py +++ b/python/test/Ice/operations/Collocated.py @@ -45,10 +45,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/operations/Server.py b/python/test/Ice/operations/Server.py index 3c740d9504e..6a0dc70da53 100755 --- a/python/test/Ice/operations/Server.py +++ b/python/test/Ice/operations/Server.py @@ -42,10 +42,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py index 3204be386dc..b2e96b39c96 100755 --- a/python/test/Ice/operations/ServerAMD.py +++ b/python/test/Ice/operations/ServerAMD.py @@ -462,10 +462,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/optional/Client.py b/python/test/Ice/optional/Client.py index a3c6610a4e9..3ebef40e6be 100755 --- a/python/test/Ice/optional/Client.py +++ b/python/test/Ice/optional/Client.py @@ -27,10 +27,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py index 7dac81076cd..2db847e0b77 100755 --- a/python/test/Ice/optional/Server.py +++ b/python/test/Ice/optional/Server.py @@ -204,10 +204,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py index a9bbda70c9b..d9cc9a9bb4a 100755 --- a/python/test/Ice/optional/ServerAMD.py +++ b/python/test/Ice/optional/ServerAMD.py @@ -210,10 +210,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/proxy/Client.py b/python/test/Ice/proxy/Client.py index ae4f2e69fbc..027a6eb070a 100755 --- a/python/test/Ice/proxy/Client.py +++ b/python/test/Ice/proxy/Client.py @@ -39,10 +39,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/proxy/Collocated.py b/python/test/Ice/proxy/Collocated.py index 26574d5b64e..bc240b8fc26 100755 --- a/python/test/Ice/proxy/Collocated.py +++ b/python/test/Ice/proxy/Collocated.py @@ -39,10 +39,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/proxy/Server.py b/python/test/Ice/proxy/Server.py index 33ec4916591..4d2826e43a0 100755 --- a/python/test/Ice/proxy/Server.py +++ b/python/test/Ice/proxy/Server.py @@ -39,10 +39,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py index 218e8f7d596..b2f71d6fcfa 100755 --- a/python/test/Ice/proxy/ServerAMD.py +++ b/python/test/Ice/proxy/ServerAMD.py @@ -56,10 +56,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/slicing/exceptions/Client.py b/python/test/Ice/slicing/exceptions/Client.py index 8192d820458..ef47308a897 100755 --- a/python/test/Ice/slicing/exceptions/Client.py +++ b/python/test/Ice/slicing/exceptions/Client.py @@ -25,10 +25,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py index da672a90a7d..29834507e62 100755 --- a/python/test/Ice/slicing/exceptions/Server.py +++ b/python/test/Ice/slicing/exceptions/Server.py @@ -170,10 +170,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py index 5dd7386d670..6be6fbe5c03 100755 --- a/python/test/Ice/slicing/exceptions/ServerAMD.py +++ b/python/test/Ice/slicing/exceptions/ServerAMD.py @@ -231,10 +231,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/slicing/objects/Client.py b/python/test/Ice/slicing/objects/Client.py index 8192d820458..ef47308a897 100755 --- a/python/test/Ice/slicing/objects/Client.py +++ b/python/test/Ice/slicing/objects/Client.py @@ -25,10 +25,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py index 53b522a6462..909e836bff4 100755 --- a/python/test/Ice/slicing/objects/Server.py +++ b/python/test/Ice/slicing/objects/Server.py @@ -383,10 +383,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py index fc5f63ca732..db617dd50e1 100755 --- a/python/test/Ice/slicing/objects/ServerAMD.py +++ b/python/test/Ice/slicing/objects/ServerAMD.py @@ -419,10 +419,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/timeout/Client.py b/python/test/Ice/timeout/Client.py index 47ce75ea8a5..f6695090351 100755 --- a/python/test/Ice/timeout/Client.py +++ b/python/test/Ice/timeout/Client.py @@ -65,10 +65,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py index 1a1b52014cc..4db8d04b78f 100755 --- a/python/test/Ice/timeout/Server.py +++ b/python/test/Ice/timeout/Server.py @@ -72,10 +72,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Slice/escape/Client.py b/python/test/Slice/escape/Client.py index 9838c64eb17..e3da840e300 100755 --- a/python/test/Slice/escape/Client.py +++ b/python/test/Slice/escape/Client.py @@ -111,10 +111,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/python/test/Slice/structure/Client.py b/python/test/Slice/structure/Client.py index 9bda6073cf9..ee963021e65 100755 --- a/python/test/Slice/structure/Client.py +++ b/python/test/Slice/structure/Client.py @@ -202,10 +202,6 @@ except: status = False if communicator: - try: - communicator.destroy() - except: - traceback.print_exc() - status = False + communicator.destroy() sys.exit(not status) diff --git a/ruby/ruby/Ice.rb b/ruby/ruby/Ice.rb index fcc46264ea9..439d4b60a4a 100644 --- a/ruby/ruby/Ice.rb +++ b/ruby/ruby/Ice.rb @@ -84,7 +84,7 @@ module Ice # T_Value = Ice.__declareClass('::Ice::Object') T_ObjectPrx = Ice.__declareProxy('::Ice::Object') - + # # Provide some common functionality for structs # @@ -93,7 +93,7 @@ module Ice ::Ice::__stringify(self, self.class::ICE_TYPE) end end - + # # Provide some common functionality for proxy classes # @@ -106,11 +106,11 @@ module Ice def ice_staticId() self::ICE_ID end - + def checkedCast(proxy, facetOrContext=nil, context=nil) ice_checkedCast(proxy, self::ICE_ID, facetOrContext, context) end - + def uncheckedCast(proxy, facet=nil) ice_uncheckedCast(proxy, facet) end @@ -143,13 +143,13 @@ module Ice T_Value.defineClass(Value, -1, false, false, nil, []) T_ObjectPrx.defineProxy(ObjectPrx, nil, []) - - + + class InterfaceByValue < Value def initialize(id) @id = id end - + def ice_id @id end @@ -455,13 +455,7 @@ module Ice } if @@_communicator - begin - @@_communicator.destroy() - rescue => ex - Ice::getProcessLogger().error($!.inspect + "\n" + ex.backtrace.join("\n")) - status = 1 - end - + @@_communicator.destroy() @@_communicator = nil end @@ -601,11 +595,8 @@ module Ice @@_destroyed = true } - begin - @@_communicator.destroy() - rescue => ex - Ice::getProcessLogger().error($!.inspect + "\n" + @@_appName + " (while destroying in response to signal " + sig + "):\n" + ex.backtrace.join("\n")) - end + @@_communicator.destroy() + @@_mutex.synchronize { @@_callbackInProcess = false @@_condVar.signal diff --git a/ruby/test/Ice/acm/Client.rb b/ruby/test/Ice/acm/Client.rb index b18ef5d61f0..e0cca249e6d 100755 --- a/ruby/test/Ice/acm/Client.rb +++ b/ruby/test/Ice/acm/Client.rb @@ -42,13 +42,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/binding/Client.rb b/ruby/test/Ice/binding/Client.rb index bc0e68e7fe7..e1b2f20ecde 100755 --- a/ruby/test/Ice/binding/Client.rb +++ b/ruby/test/Ice/binding/Client.rb @@ -29,13 +29,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/checksum/Client.rb b/ruby/test/Ice/checksum/Client.rb index 80b5bc46680..ea8090b5882 100755 --- a/ruby/test/Ice/checksum/Client.rb +++ b/ruby/test/Ice/checksum/Client.rb @@ -35,13 +35,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/enums/Client.rb b/ruby/test/Ice/enums/Client.rb index 12b234b97f3..cae734a644e 100755 --- a/ruby/test/Ice/enums/Client.rb +++ b/ruby/test/Ice/enums/Client.rb @@ -29,13 +29,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/exceptions/Client.rb b/ruby/test/Ice/exceptions/Client.rb index 06477c509ff..e5e424fc4a3 100755 --- a/ruby/test/Ice/exceptions/Client.rb +++ b/ruby/test/Ice/exceptions/Client.rb @@ -35,13 +35,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/facets/Client.rb b/ruby/test/Ice/facets/Client.rb index 2203e18c893..0ec1ad596cc 100755 --- a/ruby/test/Ice/facets/Client.rb +++ b/ruby/test/Ice/facets/Client.rb @@ -29,13 +29,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/info/Client.rb b/ruby/test/Ice/info/Client.rb index b9e84ab3014..68d3e29bb9a 100755 --- a/ruby/test/Ice/info/Client.rb +++ b/ruby/test/Ice/info/Client.rb @@ -41,13 +41,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/inheritance/Client.rb b/ruby/test/Ice/inheritance/Client.rb index fefae49406a..c6184503168 100755 --- a/ruby/test/Ice/inheritance/Client.rb +++ b/ruby/test/Ice/inheritance/Client.rb @@ -29,13 +29,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/location/Client.rb b/ruby/test/Ice/location/Client.rb index fde9cca79e3..1206d3f215b 100755 --- a/ruby/test/Ice/location/Client.rb +++ b/ruby/test/Ice/location/Client.rb @@ -37,13 +37,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/objects/Client.rb b/ruby/test/Ice/objects/Client.rb index 738e0f5949f..71ea0e214fc 100755 --- a/ruby/test/Ice/objects/Client.rb +++ b/ruby/test/Ice/objects/Client.rb @@ -30,13 +30,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/operations/Client.rb b/ruby/test/Ice/operations/Client.rb index 886cbce5072..62da276b1e6 100755 --- a/ruby/test/Ice/operations/Client.rb +++ b/ruby/test/Ice/operations/Client.rb @@ -57,13 +57,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/optional/Client.rb b/ruby/test/Ice/optional/Client.rb index 7c763f92390..18132af531b 100755 --- a/ruby/test/Ice/optional/Client.rb +++ b/ruby/test/Ice/optional/Client.rb @@ -35,13 +35,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/proxy/Client.rb b/ruby/test/Ice/proxy/Client.rb index b7aaec5a2be..2df3c1a7f9a 100755 --- a/ruby/test/Ice/proxy/Client.rb +++ b/ruby/test/Ice/proxy/Client.rb @@ -43,13 +43,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/slicing/exceptions/Client.rb b/ruby/test/Ice/slicing/exceptions/Client.rb index 1a9dc13ac47..ef903140018 100755 --- a/ruby/test/Ice/slicing/exceptions/Client.rb +++ b/ruby/test/Ice/slicing/exceptions/Client.rb @@ -29,13 +29,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/slicing/objects/Client.rb b/ruby/test/Ice/slicing/objects/Client.rb index 07b66767d67..3bd67516312 100755 --- a/ruby/test/Ice/slicing/objects/Client.rb +++ b/ruby/test/Ice/slicing/objects/Client.rb @@ -27,13 +27,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Ice/timeout/Client.rb b/ruby/test/Ice/timeout/Client.rb index dc5f8ed5eb6..68758b4edfb 100755 --- a/ruby/test/Ice/timeout/Client.rb +++ b/ruby/test/Ice/timeout/Client.rb @@ -70,13 +70,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Slice/escape/Client.rb b/ruby/test/Slice/escape/Client.rb index 8dabd753ad2..4fe7f1c03de 100755 --- a/ruby/test/Slice/escape/Client.rb +++ b/ruby/test/Slice/escape/Client.rb @@ -62,7 +62,7 @@ def run(args, communicator) g._or = 0 # TODO: Test local interface #h = BEGIN_::ExtendPrx::uncheckedCast(communicator.stringToProxy("test:tcp")) - i = BEGIN_::Redo + i = BEGIN_::Redo puts "ok" return true @@ -80,13 +80,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) diff --git a/ruby/test/Slice/structure/Client.rb b/ruby/test/Slice/structure/Client.rb index b7089a47a67..f01cec9a180 100755 --- a/ruby/test/Slice/structure/Client.rb +++ b/ruby/test/Slice/structure/Client.rb @@ -217,13 +217,7 @@ rescue => ex end if communicator - begin - communicator.destroy() - rescue => ex - puts $! - print ex.backtrace.join("\n") - status = false - end + communicator.destroy() end exit(status ? 0 : 1) |