summaryrefslogtreecommitdiff
path: root/java/src/Ice/Application.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-10-01 16:14:37 +0200
committerBenoit Foucher <benoit@zeroc.com>2013-10-01 16:14:37 +0200
commit4dcc216135d825fd97aa77cbbc762b5de1c37681 (patch)
treea53ed1f79f71bb38a925e17858111b1cfcbf8f26 /java/src/Ice/Application.java
parentFixed (ICE-5447) - Ice::Application::main doesn't catch exceptions (diff)
downloadice-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 'java/src/Ice/Application.java')
-rw-r--r--java/src/Ice/Application.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 3ce7ed25def..aaa8978b964 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -170,9 +170,14 @@ public abstract class Application
{
initData.properties = Util.createProperties(argHolder, initData.properties);
}
- catch(Ice.Exception ex)
+ catch(LocalException ex)
{
- Util.getProcessLogger().error("createProperties failed: " + IceInternal.Ex.toString(ex));
+ Util.getProcessLogger().error(IceInternal.Ex.toString(ex));
+ return 1;
+ }
+ catch(java.lang.Exception ex)
+ {
+ Util.getProcessLogger().error("unknown exception: " + IceInternal.Ex.toString(ex));
return 1;
}
_appName = initData.properties.getPropertyWithDefault("Ice.ProgramName", _appName);