archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8264148: Update spec for exceptions retrofitted for exception chaining

Browse source 
Reviewed-by: rriggs, smarks
This commit is contained in:
Joe Darcy 2021-03-30 19:59:59 +00:00
parent 353807c5f1
commit 815248ab27
22 changed files with 40 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/io/ObjectStreamClass.java
View file

@ -1193,7 +1193,7 @@ public class ObjectStreamClass implements Serializable {
try {
writeObjectMethod.invoke(obj, new Object[]{ out });
} catch (InvocationTargetException ex) {
Throwable th = ex.getTargetException();
Throwable th = ex.getCause();
if (th instanceof IOException) {
throw (IOException) th;
} else {
@ -1223,7 +1223,7 @@ public class ObjectStreamClass implements Serializable {
try {
readObjectMethod.invoke(obj, new Object[]{ in });
} catch (InvocationTargetException ex) {
Throwable th = ex.getTargetException();
Throwable th = ex.getCause();
if (th instanceof ClassNotFoundException) {
throw (ClassNotFoundException) th;
} else if (th instanceof IOException) {
@ -1254,7 +1254,7 @@ public class ObjectStreamClass implements Serializable {
try {
readObjectNoDataMethod.invoke(obj, (Object[]) null);
} catch (InvocationTargetException ex) {
Throwable th = ex.getTargetException();
Throwable th = ex.getCause();
if (th instanceof ObjectStreamException) {
throw (ObjectStreamException) th;
} else {
@ -1283,7 +1283,7 @@ public class ObjectStreamClass implements Serializable {
try {
return writeReplaceMethod.invoke(obj, (Object[]) null);
} catch (InvocationTargetException ex) {
Throwable th = ex.getTargetException();
Throwable th = ex.getCause();
if (th instanceof ObjectStreamException) {
throw (ObjectStreamException) th;
} else {
@ -1313,7 +1313,7 @@ public class ObjectStreamClass implements Serializable {
try {
return readResolveMethod.invoke(obj, (Object[]) null);
} catch (InvocationTargetException ex) {
Throwable th = ex.getTargetException();
Throwable th = ex.getCause();
if (th instanceof ObjectStreamException) {
throw (ObjectStreamException) th;
} else {

15
src/java.base/share/classes/java/io/WriteAbortedException.java
View file

@ -33,13 +33,6 @@ package java.io;
* field. The stream is reset to it's initial state and all references
* to objects already deserialized are discarded.
*
* <p>As of release 1.4, this exception has been retrofitted to conform to
* the general purpose exception-chaining mechanism. The "exception causing
* the abort" that is provided at construction time and
* accessed via the public {@link #detail} field is now known as the
* <i>cause</i>, and may be accessed via the {@link Throwable#getCause()}
* method, as well as the aforementioned "legacy field."
*
* @since 1.1
*/
public class WriteAbortedException extends ObjectStreamException {
@ -49,12 +42,13 @@ public class WriteAbortedException extends ObjectStreamException {
/**
* Exception that was caught while writing the ObjectStream.
*
* <p>This field predates the general-purpose exception chaining facility.
* The {@link Throwable#getCause()} method is now the preferred means of
* obtaining this information.
* @deprecated This field predates the general-purpose exception
* chaining facility. The {@link Throwable#getCause()} method is
* now the preferred means of obtaining this information.
*
* @serial
*/
@Deprecated(since="17")
public Exception detail;
/**
@ -87,6 +81,7 @@ public class WriteAbortedException extends ObjectStreamException {
* which may be null.
* @since 1.4
*/
@Override
public Throwable getCause() {
return detail;
}

10
src/java.base/share/classes/java/lang/ClassNotFoundException.java
View file

@ -42,13 +42,6 @@ import java.io.ObjectStreamField;
* <p>
* but no definition for the class with the specified name could be found.
*
* <p>As of release 1.4, this exception has been retrofitted to conform to
* the general purpose exception-chaining mechanism. The "optional exception
* that was raised while loading the class" that may be provided at
* construction time and accessed via the {@link #getException()} method is
* now known as the <i>cause</i>, and may be accessed via the {@link
* Throwable#getCause()} method, as well as the aforementioned "legacy method."
*
* @see java.lang.Class#forName(java.lang.String)
* @see java.lang.ClassLoader#findSystemClass(java.lang.String)
* @see java.lang.ClassLoader#loadClass(java.lang.String, boolean)
@ -95,7 +88,8 @@ public class ClassNotFoundException extends ReflectiveOperationException {
* Returns the exception that was raised if an error occurred while
* attempting to load the class. Otherwise, returns {@code null}.
*
* <p>This method predates the general-purpose exception chaining facility.
* @apiNote
* This method predates the general-purpose exception chaining facility.
* The {@link Throwable#getCause()} method is now the preferred means of
* obtaining this information.
*

10
src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
View file

@ -36,13 +36,6 @@ import java.io.ObjectStreamField;
* exception occurred during evaluation of a static initializer or the
* initializer for a static variable.
*
* <p>As of release 1.4, this exception has been retrofitted to conform to
* the general purpose exception-chaining mechanism. The "saved throwable
* object" that may be provided at construction time and accessed via
* the {@link #getException()} method is now known as the <i>cause</i>,
* and may be accessed via the {@link Throwable#getCause()} method, as well
* as the aforementioned "legacy method."
*
* @author Frank Yellin
* @since 1.1
*/
@ -92,7 +85,8 @@ public class ExceptionInInitializerError extends LinkageError {
* Returns the exception that occurred during a static initialization that
* caused this error to be created.
*
* <p>This method predates the general-purpose exception chaining facility.
* @apiNote
* This method predates the general-purpose exception chaining facility.
* The {@link Throwable#getCause()} method is now the preferred means of
* obtaining this information.
*

11
src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
View file

@ -29,13 +29,6 @@ package java.lang.reflect;
* InvocationTargetException is a checked exception that wraps
* an exception thrown by an invoked method or constructor.
*
* <p>As of release 1.4, this exception has been retrofitted to conform to
* the general purpose exception-chaining mechanism. The "target exception"
* that is provided at construction time and accessed via the
* {@link #getTargetException()} method is now known as the <i>cause</i>,
* and may be accessed via the {@link Throwable#getCause()} method,
* as well as the aforementioned "legacy method."
*
* @see Method
* @see Constructor
* @since 1.1
@ -90,7 +83,8 @@ public class InvocationTargetException extends ReflectiveOperationException {
/**
* Get the thrown target exception.
*
* <p>This method predates the general-purpose exception chaining facility.
* @apiNote
* This method predates the general-purpose exception chaining facility.
* The {@link Throwable#getCause()} method is now the preferred means of
* obtaining this information.
*
@ -107,6 +101,7 @@ public class InvocationTargetException extends ReflectiveOperationException {
* @return the cause of this exception.
* @since 1.4
*/
@Override
public Throwable getCause() {
return target;
}

12
src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
View file

@ -48,15 +48,6 @@ import jdk.internal.access.SharedSecrets;
* {@code RuntimeException}, so it is an unchecked exception
* that wraps a checked exception.
*
* <p>As of release 1.4, this exception has been retrofitted to
* conform to the general purpose exception-chaining mechanism. The
* "undeclared checked exception that was thrown by the invocation
* handler" that may be provided at construction time and accessed via
* the {@link #getUndeclaredThrowable()} method is now known as the
* <i>cause</i>, and may be accessed via the {@link
* Throwable#getCause()} method, as well as the aforementioned "legacy
* method."
*
* @author Peter Jones
* @see InvocationHandler
* @since 1.3
@ -94,7 +85,8 @@ public class UndeclaredThrowableException extends RuntimeException {
* Returns the {@code Throwable} instance wrapped in this
* {@code UndeclaredThrowableException}, which may be {@code null}.
*
* <p>This method predates the general-purpose exception chaining facility.
* @apiNote
* This method predates the general-purpose exception chaining facility.
* The {@link Throwable#getCause()} method is now the preferred means of
* obtaining this information.
*

10
src/java.base/share/classes/java/security/PrivilegedActionException.java
View file

@ -42,13 +42,6 @@ import jdk.internal.access.SharedSecrets;
* {@code PrivilegedActionException} is a "wrapper"
* for an exception thrown by a privileged action.
*
* <p>As of release 1.4, this exception has been retrofitted to conform to
* the general purpose exception-chaining mechanism. The "exception thrown
* by the privileged computation" that is provided at construction time and
* accessed via the {@link #getException()} method is now known as the
* <i>cause</i>, and may be accessed via the {@link Throwable#getCause()}
* method, as well as the aforementioned "legacy method."
*
* @since 1.2
* @see PrivilegedExceptionAction
* @see AccessController#doPrivileged(PrivilegedExceptionAction)
@ -73,7 +66,8 @@ public class PrivilegedActionException extends Exception {
* Returns the exception thrown by the privileged computation that
* resulted in this {@code PrivilegedActionException}.
*
* <p>This method predates the general-purpose exception chaining facility.
* @apiNote
* This method predates the general-purpose exception chaining facility.
* The {@link Throwable#getCause()} method is now the preferred means of
* obtaining this information.
*

4
src/java.base/share/classes/java/util/ResourceBundle.java
View file

@ -3195,7 +3195,7 @@ public abstract class ResourceBundle {
} catch (InvocationTargetException e) {
uncheckedThrow(e);
} catch (PrivilegedActionException e) {
assert e.getException() instanceof NoSuchMethodException;
assert e.getCause() instanceof NoSuchMethodException;
throw new InstantiationException("public no-arg constructor " +
"does not exist in " + bundleClass.getName());
}
@ -3230,7 +3230,7 @@ public abstract class ResourceBundle {
}
});
} catch (PrivilegedActionException e) {
throw (IOException) e.getException();
throw (IOException) e.getCause();
}
if (stream != null) {
try {