diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 11 | ||||
| -rw-r--r-- | java/src/IceInternal/IncomingAsync.java | 21 |
2 files changed, 29 insertions, 3 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index dad3214ae47..cd9e9ae53b6 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -447,6 +447,8 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Node.PrintServersReady", "Node.PropertiesOverride", "Node.ThreadPool.Size", + "Node.ThreadPool.SizeMax", + "Node.ThreadPool.SizeWarn", "Node.Trace.Activator", "Node.Trace.Adapter", "Node.Trace.Server", @@ -516,12 +518,21 @@ final class PropertiesI extends LocalObjectImpl implements Properties "Router.AllowCategories", "Router.Client.BatchSleepTime", "Router.Client.Endpoints", + "Router.Client.ThreadPool.Size", + "Router.Client.ThreadPool.SizeMax", + "Router.Client.ThreadPool.SizeWarn", "Router.Client.ForwardContext", "Router.Endpoints", + "Router.ThreadPool.Size", + "Router.ThreadPool.SizeMax", + "Router.ThreadPool.SizeWarn", "Router.Identity", "Router.PrintProxyOnFd", "Router.Server.BatchSleepTime", "Router.Server.Endpoints", + "Router.Server.ThreadPool.Size", + "Router.Server.ThreadPool.SizeMax", + "Router.Server.ThreadPool.SizeWarn", "Router.Server.ForwardContext", "Router.SessionManager", "Router.Trace.Client", diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java index 6a56d13b7ad..25372dd4485 100644 --- a/java/src/IceInternal/IncomingAsync.java +++ b/java/src/IceInternal/IncomingAsync.java @@ -134,7 +134,12 @@ public class IncomingAsync extends IncomingBase _os.endWriteEncaps(); _os.resize(Protocol.headerSize + 4, false); // Dispatch status position. _os.writeByte((byte)DispatchStatus._DispatchUnknownLocalException); - _os.writeString(ex.toString()); +// _os.writeString(ex.toString()); + java.io.StringWriter sw = new java.io.StringWriter(); + java.io.PrintWriter pw = new java.io.PrintWriter(sw); + ex.printStackTrace(pw); + pw.flush(); + _os.writeString(sw.toString()); } } catch(Ice.UserException ex) @@ -149,7 +154,12 @@ public class IncomingAsync extends IncomingBase _os.endWriteEncaps(); _os.resize(Protocol.headerSize + 4, false); // Dispatch status position. _os.writeByte((byte)DispatchStatus._DispatchUnknownUserException); - _os.writeString(ex.toString()); +// _os.writeString(ex.toString()); + java.io.StringWriter sw = new java.io.StringWriter(); + java.io.PrintWriter pw = new java.io.PrintWriter(sw); + ex.printStackTrace(pw); + pw.flush(); + _os.writeString(sw.toString()); } } catch(Exception ex) @@ -164,7 +174,12 @@ public class IncomingAsync extends IncomingBase _os.endWriteEncaps(); _os.resize(Protocol.headerSize + 4, false); // Dispatch status position. _os.writeByte((byte)DispatchStatus._DispatchUnknownException); - _os.writeString(ex.toString()); +// _os.writeString(ex.toString()); + java.io.StringWriter sw = new java.io.StringWriter(); + java.io.PrintWriter pw = new java.io.PrintWriter(sw); + ex.printStackTrace(pw); + pw.flush(); + _os.writeString(sw.toString()); } } |