diff options
| author | Jose <jose@zeroc.com> | 2013-10-01 15:56:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-10-01 15:56:05 +0200 |
| commit | 297aca243804ebec264bbd24092f57bdde5894df (patch) | |
| tree | 8d88b3ca4840919874fd44de0db470f0976f1ce5 /java/src/Ice/Application.java | |
| parent | Fixed testicedist.py getJavaHome check for x64 (diff) | |
| download | ice-297aca243804ebec264bbd24092f57bdde5894df.tar.bz2 ice-297aca243804ebec264bbd24092f57bdde5894df.tar.xz ice-297aca243804ebec264bbd24092f57bdde5894df.zip | |
Fixed (ICE-5447) - Ice::Application::main doesn't catch exceptions
Diffstat (limited to 'java/src/Ice/Application.java')
| -rw-r--r-- | java/src/Ice/Application.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java index 2d72b1d1c08..3ce7ed25def 100644 --- a/java/src/Ice/Application.java +++ b/java/src/Ice/Application.java @@ -166,8 +166,15 @@ public abstract class Application initData = new InitializationData(); } StringSeqHolder argHolder = new StringSeqHolder(args); - initData.properties = Util.createProperties(argHolder, initData.properties); - + try + { + initData.properties = Util.createProperties(argHolder, initData.properties); + } + catch(Ice.Exception ex) + { + Util.getProcessLogger().error("createProperties failed: " + IceInternal.Ex.toString(ex)); + return 1; + } _appName = initData.properties.getPropertyWithDefault("Ice.ProgramName", _appName); // |