summaryrefslogtreecommitdiff
path: root/java/src/Ice/Application.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2009-08-21 15:55:01 +0200
committerBenoit Foucher <benoit@zeroc.com>2009-08-21 15:55:01 +0200
commitb9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a (patch)
tree183215e2dbeadfbc871b800ce09726e58af38b91 /java/src/Ice/Application.java
parentadding compression cookbook demo (diff)
downloadice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.tar.bz2
ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.tar.xz
ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.zip
IOCP changes, bug 3501, 4200, 4156, 3101
Diffstat (limited to 'java/src/Ice/Application.java')
-rw-r--r--java/src/Ice/Application.java31
1 files changed, 7 insertions, 24 deletions
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 3bb0cb74205..01b42196f8c 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -106,12 +106,12 @@ public abstract class Application
}
catch(LocalException ex)
{
- error("", ex);
+ Util.getProcessLogger().error(IceInternal.Ex.toString(ex));
return 1;
}
catch(java.lang.Exception ex)
{
- error("unknown exception", ex);
+ Util.getProcessLogger().error("unknown exception: " + IceInternal.Ex.toString(ex));
return 1;
}
}
@@ -195,12 +195,12 @@ public abstract class Application
}
catch(LocalException ex)
{
- error("", ex);
+ Util.getProcessLogger().error(IceInternal.Ex.toString(ex));
status = 1;
}
catch(java.lang.Exception ex)
{
- error("unknown exception", ex);
+ Util.getProcessLogger().error("unknown exception: " + IceInternal.Ex.toString(ex));
status = 1;
}
catch(java.lang.Error err)
@@ -208,7 +208,7 @@ public abstract class Application
//
// We catch Error to avoid hangs in some non-fatal situations
//
- error("Java error", err);
+ Util.getProcessLogger().error("Java error: " + IceInternal.Ex.toString(err));
status = 1;
}
@@ -254,12 +254,12 @@ public abstract class Application
}
catch(LocalException ex)
{
- error("", ex);
+ Util.getProcessLogger().error(IceInternal.Ex.toString(ex));
status = 1;
}
catch(java.lang.Exception ex)
{
- error("unknown exception", ex);
+ Util.getProcessLogger().error("unknown exception: " + IceInternal.Ex.toString(ex));
status = 1;
}
_communicator = null;
@@ -642,23 +642,6 @@ public abstract class Application
private Thread _hook;
}
- private void
- error(String msg, java.lang.Throwable ex)
- {
- java.io.StringWriter sw = new java.io.StringWriter();
- java.io.PrintWriter pw = new java.io.PrintWriter(sw);
- ex.printStackTrace(pw);
- pw.flush();
- if(msg.equals(""))
- {
- Util.getProcessLogger().error(sw.toString());
- }
- else
- {
- Util.getProcessLogger().error(msg + ":\n" + sw.toString());
- }
- }
-
private static String _appName;
private static Communicator _communicator;
private static AppHook _appHook;