diff options
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/server/UnicastServer.java | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/server/UnicastServerRef.java | 11 |
3 files changed, 23 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 107a673..ab395dc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2004-09-24 Ilya Perminov <iperminov@logicalsoft.com> + + * gnu/java/rmi/server/UnicastServer.java + (incomingMessageCall): Added code to handle Errors. + * gnu/java/rmi/server/UnicastServerRef.java + (incomingMessageCall): Added code to handle Errors. + + 2004-09-24 Tom Tromey <tromey@redhat.com> * java/lang/ClassLoader.java (loadedClasses): Declare as HashMap. diff --git a/libjava/gnu/java/rmi/server/UnicastServer.java b/libjava/gnu/java/rmi/server/UnicastServer.java index ace43f0..4230954 100644 --- a/libjava/gnu/java/rmi/server/UnicastServer.java +++ b/libjava/gnu/java/rmi/server/UnicastServer.java @@ -46,6 +46,7 @@ import java.net.InetAddress; import java.util.Hashtable; import java.net.UnknownHostException; import java.rmi.Remote; +import java.rmi.ServerError; import java.rmi.server.ObjID; import java.rmi.server.UnicastRemoteObject; import java.rmi.server.UID; @@ -136,6 +137,10 @@ private static void incomingMessageCall(UnicastConnection conn) throws IOExcepti returnval = e; returncode = RETURN_NACK; } + catch (Error e) { + returnval = new ServerError ("An Error is thrown while processing the invocation on the server", e); + returncode = RETURN_NACK; + } } else { returnval = new NoSuchObjectException(""); diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java index 3e9529c..1c5823a 100644 --- a/libjava/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java @@ -284,7 +284,16 @@ public Object incomingMessageCall(UnicastConnection conn, int method, long hash) try{ ret = meth.invoke(myself, args); }catch(InvocationTargetException e){ - throw (Exception)(e.getTargetException()); + Throwable cause = e.getTargetException(); + if (cause instanceof Exception) { + throw (Exception)cause; + } + else if (cause instanceof Error) { + throw (Error)cause; + } + else { + throw new Error("The remote method threw a java.lang.Throwable that is neither java.lang.Exception nor java.lang.Error.", e); + } } return ret; } |