diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-10-01 16:14:37 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-10-01 16:14:37 +0200 |
| commit | 4dcc216135d825fd97aa77cbbc762b5de1c37681 (patch) | |
| tree | a53ed1f79f71bb38a925e17858111b1cfcbf8f26 /cpp/src/Ice/Application.cpp | |
| parent | Fixed (ICE-5447) - Ice::Application::main doesn't catch exceptions (diff) | |
| download | ice-4dcc216135d825fd97aa77cbbc762b5de1c37681.tar.bz2 ice-4dcc216135d825fd97aa77cbbc762b5de1c37681.tar.xz ice-4dcc216135d825fd97aa77cbbc762b5de1c37681.zip | |
Minor fix to previous fix to be consistent with other parts of the code
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
| -rw-r--r-- | cpp/src/Ice/Application.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index f0779d4499b..09403dd6252 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -387,10 +387,16 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial { initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); } - catch(const Ice::Exception& ex) + catch(const std::exception& ex) { - Error err(getProcessLogger()); - err << "createProperties failed: " << ex; + Error out(getProcessLogger()); + out << ex; + return EXIT_FAILURE; + } + catch(...) + { + Error out(getProcessLogger()); + out << "unknown exception"; return EXIT_FAILURE; } IceInternal::Application::_appName = initData.properties->getPropertyWithDefault("Ice.ProgramName", |