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
This commit is contained in:
Nathanael Nerode 2002-06-17 19:11:40 +00:00 committed by Tom Tromey
parent df696a7573
commit 1a4b27e82f
11 changed files with 442 additions and 186 deletions

View File

@ -1,3 +1,17 @@
2002-06-17 Nathanael Nerode <neroden@twcny.rr.com>
* 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 <tromey@redhat.com>
* gcj/javaprims.h: Updated class declaration list.

View File

@ -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 {
/**
* 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) {
super(s);
}
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);
}
}

View File

@ -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;
/**
* General exception class for <code>java.rmi.activation</code>.
*
* @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;
public class ActivationException
extends Exception {
/**
* 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;
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);
}
/**
* 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:
* <code>super.getMessage() + (detail == null ? ""
* : "; nested exception is:\n\t" + detail)<code>.
*
* @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 <code>detail</code> field being public
* and non-final (yuck). However, to avoid violating the contract of
* Throwable.getCause(), this returns null if <code>detail == this</code>,
* as no exception can be its own cause.
*
* @return the cause
* @since 1.4
*/
public Throwable getCause()
{
return detail == this ? null : detail;
}
}

View File

@ -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 <code>ActivationGroupID</code> 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);
}
}

View File

@ -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 <code>ActivationID</code> 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);
}
}

View File

@ -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 {
/**
* 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) {
super(s);
}
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);
}
}

View File

@ -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;
/**
* Thrown if a remote exception occurs during the cloning process of a
* <code>UnicastRemoteObject</code>.
*
* @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;
public class ServerCloneException
extends CloneNotSupportedException {
/**
* 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;
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);
}
/**
* 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:
* <code>super.getMessage() + (detail == null ? ""
* : "; nested exception is:\n\t" + detail)<code>.
*
* @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 <code>detail</code> field being public
* and non-final (yuck). However, to avoid violating the contract of
* Throwable.getCause(), this returns null if <code>detail == this</code>,
* as no exception can be its own cause.
*
* @return the cause
* @since 1.4
*/
public Throwable getCause()
{
return detail == this ? null : detail;
}
}

View File

@ -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;
/**
* Thrown during <code>RemoteServer.getClientHost</code> 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 class ServerNotActiveException
extends Exception {
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);
}
}

View File

@ -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);
}
}

View File

@ -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 {
/**
* 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) {
super(s);
}
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);
}
}

View File

@ -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;
/**
* Thrown during remote object export if the code does not have permission
* to create a <code>java.net.ServerSocket</code> 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 class SocketSecurityException
extends ExportException {
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);
}
}