summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-10-01 15:56:05 +0200
committerJose <jose@zeroc.com>2013-10-01 15:56:05 +0200
commit297aca243804ebec264bbd24092f57bdde5894df (patch)
tree8d88b3ca4840919874fd44de0db470f0976f1ce5 /cpp
parentFixed testicedist.py getJavaHome check for x64 (diff)
downloadice-297aca243804ebec264bbd24092f57bdde5894df.tar.bz2
ice-297aca243804ebec264bbd24092f57bdde5894df.tar.xz
ice-297aca243804ebec264bbd24092f57bdde5894df.zip
Fixed (ICE-5447) - Ice::Application::main doesn't catch exceptions
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/Application.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 448153d95e1..f0779d4499b 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -383,8 +383,16 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
// We parse the properties here to extract Ice.ProgramName.
//
InitializationData initData = initializationData;
- initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
-
+ try
+ {
+ initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
+ }
+ catch(const Ice::Exception& ex)
+ {
+ Error err(getProcessLogger());
+ err << "createProperties failed: " << ex;
+ return EXIT_FAILURE;
+ }
IceInternal::Application::_appName = initData.properties->getPropertyWithDefault("Ice.ProgramName",
IceInternal::Application::_appName);