* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54711 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 85 insertions, 51 deletions

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 <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;
+
+  /**
+   * 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:
+   * <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;
+  }
 }