stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8012044: Give more information about self-suppression from Throwable.addSuppressed

Browse Source 
Reviewed-by: alanb, dholmes
This commit is contained in:
Joe Darcy 2013-04-25 09:37:03 -07:00
parent 0872993c6c
commit edbd8cf91c
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/share/classes/java/lang/Throwable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -453,9 +453,10 @@ public class Throwable implements Serializable {
*/
public synchronized Throwable initCause(Throwable cause) {
if (this.cause != this)
throw new IllegalStateException("Can't overwrite cause");
throw new IllegalStateException("Can't overwrite cause with " +
Objects.toString(cause, "a null"), this);
if (cause == this)
throw new IllegalArgumentException("Self-causation not permitted");
throw new IllegalArgumentException("Self-causation not permitted", this);
this.cause = cause;
return this;
}
@ -1039,7 +1040,7 @@ public class Throwable implements Serializable {
*/
public final synchronized void addSuppressed(Throwable exception) {
if (exception == this)
throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE, exception);
if (exception == null)
throw new NullPointerException(NULL_CAUSE_MESSAGE);

41
jdk/test/java/lang/Throwable/SuppressedExceptions.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,7 @@ import java.util.*;
/*
* @test
* @bug 6911258 6962571 6963622 6991528 7005628
* @bug 6911258 6962571 6963622 6991528 7005628 8012044
* @summary Basic tests of suppressed exceptions
* @author Joseph D. Darcy
*/
@ -40,6 +40,7 @@ public class SuppressedExceptions {
serializationTest();
selfReference();
noModification();
initCausePlumbing();
}
private static void noSelfSuppression() {
@ -48,7 +49,9 @@ public class SuppressedExceptions {
throwable.addSuppressed(throwable);
throw new RuntimeException("IllegalArgumentException for self-suppresion not thrown.");
} catch (IllegalArgumentException iae) {
; // Expected
// Expected to be here
if (iae.getCause() != throwable)
throw new RuntimeException("Bad cause after self-suppresion.");
}
}
@ -208,4 +211,36 @@ public class SuppressedExceptions {
super("The medium.", null, enableSuppression, true);
}
}
private static void initCausePlumbing() {
Throwable t1 = new Throwable();
Throwable t2 = new Throwable("message", t1);
Throwable t3 = new Throwable();
try {
t2.initCause(t3);
throw new RuntimeException("Shouldn't reach.");
} catch (IllegalStateException ise) {
if (ise.getCause() != t2)
throw new RuntimeException("Unexpected cause in ISE", ise);
Throwable[] suppressed = ise.getSuppressed();
if (suppressed.length != 0)
throw new RuntimeException("Bad suppression in ISE", ise);
}
try {
t2.initCause(null);
throw new RuntimeException("Shouldn't reach.");
} catch (IllegalStateException ise) {
; // Expected; don't want an NPE.
}
try {
t3.initCause(t3);
throw new RuntimeException("Shouldn't reach.");
} catch (IllegalArgumentException iae) {
if (iae.getCause() != t3)
throw new RuntimeException("Unexpected cause in ISE", iae);
}
}
}