From 1a4b27e82f736d70477d9d998542d5f2cb72121b Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Mon, 17 Jun 2002 19:11:40 +0000 Subject: [PATCH] ActivateFailedException.java: Remerge from Classpath version. * java/rmi/activation/ActivateFailedException.java: Remerge from Classpath version. * java/rmi/activation/ActivationException.java: Ditto. * java/rmi/activation/UnknownGroupException.java: Ditto. * java/rmi/activation/UnknownObjectException.java: Ditto. * java/rmi/server/ExportException: Ditto. * java/rmi/server/ServerCloneException: Ditto. * java/rmi/server/ServerNotActiveException: Ditto. * java/rmi/server/SkeletonMismatchException: Ditto. * java/rmi/server/SkeletonNotFoundException: Ditto. * java/rmi/server/SocketSecurityException: Ditto. From-SVN: r54711 --- libjava/ChangeLog | 14 ++ .../activation/ActivateFailedException.java | 47 ++++-- .../rmi/activation/ActivationException.java | 136 +++++++++++------- .../rmi/activation/UnknownGroupException.java | 38 +++-- .../activation/UnknownObjectException.java | 40 ++++-- libjava/java/rmi/server/ExportException.java | 49 +++++-- .../java/rmi/server/ServerCloneException.java | 129 ++++++++++------- .../rmi/server/ServerNotActiveException.java | 47 ++++-- .../rmi/server/SkeletonMismatchException.java | 39 +++-- .../rmi/server/SkeletonNotFoundException.java | 51 +++++-- .../rmi/server/SocketSecurityException.java | 50 +++++-- 11 files changed, 448 insertions(+), 192 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 40cf98a14d0..ea816d9df8d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,17 @@ +2002-06-17 Nathanael Nerode + + * java/rmi/activation/ActivateFailedException.java: Remerge from + Classpath version. + * java/rmi/activation/ActivationException.java: Ditto. + * java/rmi/activation/UnknownGroupException.java: Ditto. + * java/rmi/activation/UnknownObjectException.java: Ditto. + * java/rmi/server/ExportException: Ditto. + * java/rmi/server/ServerCloneException: Ditto. + * java/rmi/server/ServerNotActiveException: Ditto. + * java/rmi/server/SkeletonMismatchException: Ditto. + * java/rmi/server/SkeletonNotFoundException: Ditto. + * java/rmi/server/SocketSecurityException: Ditto. + 2002-06-16 Tom Tromey * gcj/javaprims.h: Updated class declaration list. diff --git a/libjava/java/rmi/activation/ActivateFailedException.java b/libjava/java/rmi/activation/ActivateFailedException.java index 3b107d55d0c..02d764c6cc6 100644 --- a/libjava/java/rmi/activation/ActivateFailedException.java +++ b/libjava/java/rmi/activation/ActivateFailedException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivateFailedException.java -- thrown when activation fails + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,15 +39,38 @@ package java.rmi.activation; import java.rmi.RemoteException; -public class ActivateFailedException - extends RemoteException { - -public ActivateFailedException(String s) { - super(s); -} +/** + * Thrown when activation fails on a remote call to an activatable object. + * + * @author unknown + * @since 1.2 + * @status updated to 1.4 + */ +public class ActivateFailedException extends RemoteException +{ + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 4863550261346652506L; -public ActivateFailedException(String s, Exception ex) { - super(s, ex); -} + /** + * Create an exception with a message. + * + * @param s the message + */ + public ActivateFailedException(String s) + { + super(s); + } + /** + * Create an exception with a message and a cause. + * + * @param s the message + * @param ex the cause + */ + public ActivateFailedException(String s, Exception ex) + { + super(s, ex); + } } diff --git a/libjava/java/rmi/activation/ActivationException.java b/libjava/java/rmi/activation/ActivationException.java index 8734ab4f479..a1ac7bd6a28 100644 --- a/libjava/java/rmi/activation/ActivationException.java +++ b/libjava/java/rmi/activation/ActivationException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationException.java -- general Activation exception + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,52 +37,86 @@ exception statement from your version. */ package java.rmi.activation; -import java.io.PrintStream; -import java.io.PrintWriter; - -public class ActivationException - extends Exception { - -public Throwable detail; - -public ActivationException() { - super(); -} - -public ActivationException(String s) { - super(s); -} - -public ActivationException(String s, Throwable ex) { - super(s); - detail = ex; -} - -public String getMessage() { - if (detail == null) { - return (super.getMessage()); - } - else { - return (super.getMessage() + ":" + detail.getMessage()); - } -} - -public void printStackTrace(PrintStream s) { - if (detail != null) { - detail.printStackTrace(s); - } - super.printStackTrace(s); -} - -public void printStackTrace() { - printStackTrace(System.err); -} - -public void printStackTrace(PrintWriter s) { - if (detail != null) { - detail.printStackTrace(s); - } - super.printStackTrace(s); -} - +/** + * General exception class for java.rmi.activation. + * + * @author unknown + * @since 1.2 + * @status updated to 1.4 + */ +public class ActivationException extends Exception +{ + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = -4320118837291406071L; + + /** + * The cause of this exception. This pre-dates the exception chaining + * of Throwable; and although you can change this field, you are wiser + * to leave it alone. + * + * @serial the exception cause + */ + public Throwable detail; + + /** + * Create an exception with no message, and cause initialized to null. + */ + public ActivationException() + { + this(null, null); + } + + /** + * Create an exception with the given message, and cause initialized to null. + * + * @param s the message + */ + public ActivationException(String s) + { + this(s, null); + } + + /** + * Create an exception with the given message and cause. + * + * @param s the message + * @param ex the cause + */ + public ActivationException(String s, Throwable ex) + { + super(s, ex); + detail = ex; + } + + /** + * This method returns a message indicating what went wrong, in this + * format: + * super.getMessage() + (detail == null ? "" + * : "; nested exception is:\n\t" + detail). + * + * @return the chained message + */ + public String getMessage() + { + if (detail == this || detail == null) + return super.getMessage(); + return super.getMessage() + "; nested exception is:\n\t" + detail; + } + + /** + * Returns the cause of this exception. Note that this may not be the + * original cause, thanks to the detail field being public + * and non-final (yuck). However, to avoid violating the contract of + * Throwable.getCause(), this returns null if detail == this, + * as no exception can be its own cause. + * + * @return the cause + * @since 1.4 + */ + public Throwable getCause() + { + return detail == this ? null : detail; + } } diff --git a/libjava/java/rmi/activation/UnknownGroupException.java b/libjava/java/rmi/activation/UnknownGroupException.java index b9a5cbca8c4..b53e8c28edf 100644 --- a/libjava/java/rmi/activation/UnknownGroupException.java +++ b/libjava/java/rmi/activation/UnknownGroupException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* UnknownGroupException.java -- thrown on an invalid ActivationGroupID + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,11 +37,33 @@ exception statement from your version. */ package java.rmi.activation; -public class UnknownGroupException - extends ActivationException { - -public UnknownGroupException(String s) { - super(s); -} +/** + * Thrown when an ActivationGroupID parameter is invalid or + * unknown. + * + * @author unknown + * @see Activatable + * @see ActivationGroup + * @see ActivationID + * @see ActivationMonitor + * @see ActivationSystem + * @since 1.2 + * @status updated to 1.4 + */ +public class UnknownGroupException extends ActivationException +{ + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 7056094974750002460L; + /** + * Create an exception with a message. + * + * @param s the message + */ + public UnknownGroupException(String s) + { + super(s); + } } diff --git a/libjava/java/rmi/activation/UnknownObjectException.java b/libjava/java/rmi/activation/UnknownObjectException.java index 8dfdd216c71..81e3871ad9f 100644 --- a/libjava/java/rmi/activation/UnknownObjectException.java +++ b/libjava/java/rmi/activation/UnknownObjectException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* UnknownObjectException.java -- thrown on an invalid ActivationID + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,11 +37,33 @@ exception statement from your version. */ package java.rmi.activation; -public class UnknownObjectException - extends ActivationException { - -public UnknownObjectException(String s) { - super(s); -} +/** + * Thrown when an ActivationID parameter is invalid or unknown. + * + * @author unknown + * @see Activatable + * @see ActivationGroup + * @see ActivationID + * @see ActivationMonitor + * @see ActivationSystem + * @see Activator + * @since 1.2 + * @status updated to 1.4 + */ +public class UnknownObjectException extends ActivationException +{ + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 3425547551622251430L; + /** + * Create an exception with an error message. + * + * @param s the message + */ + public UnknownObjectException(String s) + { + super(s); + } } diff --git a/libjava/java/rmi/server/ExportException.java b/libjava/java/rmi/server/ExportException.java index 7bb8f16445e..20e565c7372 100644 --- a/libjava/java/rmi/server/ExportException.java +++ b/libjava/java/rmi/server/ExportException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ExportException.java -- an export attempt failed + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,15 +39,40 @@ package java.rmi.server; import java.rmi.RemoteException; -public class ExportException - extends RemoteException { - -public ExportException(String s) { - super(s); -} +/** + * Thrown if an attempt to export a remote object fails. + * + * @author unknown + * @see UnicastRemoteObject + * @see Activatable + * @since 1.1 + * @status updated to 1.4 + */ +public class ExportException extends RemoteException +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -9155485338494060170L; -public ExportException(String s, Exception e) { - super(s, e); -} + /** + * Create an exception with the specified message. + * + * @param s the message + */ + public ExportException(String s) + { + super(s); + } + /** + * Create an exception with the specified message and cause. + * + * @param s the message + * @param e the cause + */ + public ExportException(String s, Exception e) + { + super(s, e); + } } diff --git a/libjava/java/rmi/server/ServerCloneException.java b/libjava/java/rmi/server/ServerCloneException.java index 77cc1b3764f..faf43c8e29c 100644 --- a/libjava/java/rmi/server/ServerCloneException.java +++ b/libjava/java/rmi/server/ServerCloneException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ServerCloneException.java -- a UnicastRemoteObject could not be cloned + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,50 +37,81 @@ exception statement from your version. */ package java.rmi.server; -import java.lang.CloneNotSupportedException; -import java.io.PrintStream; -import java.io.PrintWriter; - -public class ServerCloneException - extends CloneNotSupportedException { - -public Exception detail; - -public ServerCloneException(String s) { - super(s); - detail = null; -} - -public ServerCloneException(String s, Exception e) { - super(s); - detail = e; -} - -public String getMessage() { - if (detail != null) { - return (super.getMessage() + ":" + detail.getMessage()); - } - else { - return (super.getMessage()); - } -} - -public void printStackTrace(PrintStream s) { - if (detail != null) { - detail.printStackTrace(s); - } - super.printStackTrace(s); -} - -public void printStackTrace() { - printStackTrace(System.err); -} - -public void printStackTrace(PrintWriter s) { - if (detail != null) { - detail.printStackTrace(s); - } - super.printStackTrace(s); -} - +/** + * Thrown if a remote exception occurs during the cloning process of a + * UnicastRemoteObject. + * + * @author unknown + * @see UnicastRemoteObject#clone() + * @since 1.1 + * @status updated to 1.4 + */ +public class ServerCloneException extends CloneNotSupportedException +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 6617456357664815945L; + + /** + * The cause of this exception. This pre-dates the exception chaining + * of Throwable; and although you can change this field, you are wiser + * to leave it alone. + * + * @serial the exception cause + */ + public Exception detail; + + /** + * Create an exception with a message. + * + * @param s the message + */ + public ServerCloneException(String s) + { + this(s, null); + } + + /** + * Create an exception with a message and a cause. + * + * @param s the message + * @param e the cause + */ + public ServerCloneException(String s, Exception e) + { + super(s); + initCause(e); + detail = e; + } + + /** + * This method returns a message indicating what went wrong, in this + * format: + * super.getMessage() + (detail == null ? "" + * : "; nested exception is:\n\t" + detail). + * + * @return the chained message + */ + public String getMessage() + { + if (detail == this || detail == null) + return super.getMessage(); + return super.getMessage() + "; nested exception is:\n\t" + detail; + } + + /** + * Returns the cause of this exception. Note that this may not be the + * original cause, thanks to the detail field being public + * and non-final (yuck). However, to avoid violating the contract of + * Throwable.getCause(), this returns null if detail == this, + * as no exception can be its own cause. + * + * @return the cause + * @since 1.4 + */ + public Throwable getCause() + { + return detail == this ? null : detail; + } } diff --git a/libjava/java/rmi/server/ServerNotActiveException.java b/libjava/java/rmi/server/ServerNotActiveException.java index 18c8e76bd3a..426d5e325a8 100644 --- a/libjava/java/rmi/server/ServerNotActiveException.java +++ b/libjava/java/rmi/server/ServerNotActiveException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ServerNotActiveException.java -- the method is not servicing a remote call + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,17 +37,36 @@ exception statement from your version. */ package java.rmi.server; -import java.lang.Exception; - -public class ServerNotActiveException - extends Exception { +/** + * Thrown during RemoteServer.getClientHost if the host is + * not servicing a remote method call. + * + * @author unknown + * @see RemoteServer#getClientHost() + * @since 1.1 + * @status updated to 1.4 + */ +public class ServerNotActiveException extends Exception +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 4687940720827538231L; -public ServerNotActiveException() { - super(); -} - -public ServerNotActiveException(String s) { - super(s); -} + /** + * Create an exception with no message. + */ + public ServerNotActiveException() + { + } + /** + * Create an exception with a message. + * + * @param s the message + */ + public ServerNotActiveException(String s) + { + super(s); + } } diff --git a/libjava/java/rmi/server/SkeletonMismatchException.java b/libjava/java/rmi/server/SkeletonMismatchException.java index 9d6986a5816..5a4b6ae96df 100644 --- a/libjava/java/rmi/server/SkeletonMismatchException.java +++ b/libjava/java/rmi/server/SkeletonMismatchException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* SkeletonMismatchException.java -- thrown when stub class versions mismatch + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,13 +39,30 @@ package java.rmi.server; import java.rmi.RemoteException; -public class SkeletonMismatchException - extends RemoteException { - -public static final long serialVersionUID = -7780460454818859281l; - -public SkeletonMismatchException(String s) { - super(s); -} +/** + * Thrown if a call is received that does not match a Skeleton. Note that + * Skeletons are no longer required. + * + * @author unknown + * @since 1.1 + * @deprecated no replacement. Skeletons are no longer required. + * @status updated to 1.4 + */ +public class SkeletonMismatchException extends RemoteException +{ + /** + * Compatible with JDK 1.1. + */ + private static final long serialVersionUID = -7780460454818859281l; + /** + * Create an exception with the specified message. + * + * @param s the message + * @deprecated no longer needed + */ + public SkeletonMismatchException(String s) + { + super(s); + } } diff --git a/libjava/java/rmi/server/SkeletonNotFoundException.java b/libjava/java/rmi/server/SkeletonNotFoundException.java index 5c4fb4b8341..41819d938f5 100644 --- a/libjava/java/rmi/server/SkeletonNotFoundException.java +++ b/libjava/java/rmi/server/SkeletonNotFoundException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* SkeletonNotFoundException.java -- thrown if a Skeleton is not found + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,15 +39,42 @@ package java.rmi.server; import java.rmi.RemoteException; -public class SkeletonNotFoundException - extends RemoteException { - -public SkeletonNotFoundException(String s) { - super(s); -} +/** + * Thrown if a Skeleton corresponding to the remote object is not found. + * Note that Skeletons are no longer required. + * + * @author unknown + * @since 1.1 + * @deprecated no replacement. Skeletons are no longer required. + * @status updated to 1.4 + */ +public class SkeletonNotFoundException extends RemoteException +{ + /** + * Compatible with JDK 1.1. + */ + private static final long serialVersionUID = -7860299673822761231L; -public SkeletonNotFoundException(String s, Exception e) { - super(s, e); -} + /** + * Create an exception with the specified message. + * + * @param s the message + * @deprecated no longer needed + */ + public SkeletonNotFoundException(String s) + { + super(s); + } + /** + * Create an exception with the specified message and cause. + * + * @param s the message + * @param e the cause + * @deprecated no longer needed + */ + public SkeletonNotFoundException(String s, Exception e) + { + super(s, e); + } } diff --git a/libjava/java/rmi/server/SocketSecurityException.java b/libjava/java/rmi/server/SocketSecurityException.java index fbd36afdf74..314ad8784f9 100644 --- a/libjava/java/rmi/server/SocketSecurityException.java +++ b/libjava/java/rmi/server/SocketSecurityException.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* SocketSecurityException.java -- the socket could not be created + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,17 +37,39 @@ exception statement from your version. */ package java.rmi.server; -import java.rmi.server.ExportException; - -public class SocketSecurityException - extends ExportException { +/** + * Thrown during remote object export if the code does not have permission + * to create a java.net.ServerSocket on the specified port. + * + * @author unknown + * @since 1.1 + * @status updated to 1.4 + */ +public class SocketSecurityException extends ExportException +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -7622072999407781979L; -public SocketSecurityException(String s) { - super(s); -} - -public SocketSecurityException(String s, Exception e) { - super(s, e); -} + /** + * Create an exception with the specified message. + * + * @param s the message + */ + public SocketSecurityException(String s) + { + super(s); + } + /** + * Create an exception with the specified message and cause. + * + * @param s the message + * @param e the cause + */ + public SocketSecurityException(String s, Exception e) + { + super(s, e); + } } -- 2.30.2