diff -r 78a4f1f6b88d -r 1079ae7ada52 jdk/test/java/lang/Throwable/ChainedExceptions.java
--- a/jdk/test/java/lang/Throwable/ChainedExceptions.java	Thu Apr 21 17:44:55 2011 -0400
+++ b/jdk/test/java/lang/Throwable/ChainedExceptions.java	Thu Apr 21 15:55:59 2011 -0700
@@ -13,28 +13,28 @@
             StackTraceElement[] highTrace = e.getStackTrace();
             int depthTrim = highTrace.length - 2;
 
-            check(highTrace[0], "a",    48);
-            check(highTrace[1], "main", 11);
+            check(e, highTrace[0], "a",    48);
+            check(e, highTrace[1], "main", 11);
 
             Throwable mid = e.getCause();
             StackTraceElement[] midTrace = mid.getStackTrace();
             if (midTrace.length - depthTrim != 4)
                 throw new RuntimeException("Mid depth");
-            check(midTrace[0], "c",    58);
-            check(midTrace[1], "b",    52);
-            check(midTrace[2], "a",    46);
-            check(midTrace[3], "main", 11);
+            check(mid, midTrace[0], "c",    58);
+            check(mid, midTrace[1], "b",    52);
+            check(mid, midTrace[2], "a",    46);
+            check(mid, midTrace[3], "main", 11);
 
             Throwable low = mid.getCause();
             StackTraceElement[] lowTrace = low.getStackTrace();
             if (lowTrace.length - depthTrim != 6)
                 throw new RuntimeException("Low depth");
-            check(lowTrace[0], "e",    65);
-            check(lowTrace[1], "d",    62);
-            check(lowTrace[2], "c",    56);
-            check(lowTrace[3], "b",    52);
-            check(lowTrace[4], "a",    46);
-            check(lowTrace[5], "main", 11);
+            check(low, lowTrace[0], "e",    65);
+            check(low, lowTrace[1], "d",    62);
+            check(low, lowTrace[2], "c",    56);
+            check(low, lowTrace[3], "b",    52);
+            check(low, lowTrace[4], "a",    46);
+            check(low, lowTrace[5], "main", 11);
 
             if (low.getCause() != null)
                 throw new RuntimeException("Low cause != null");
@@ -68,15 +68,15 @@
     private static final String OUR_CLASS  = ChainedExceptions.class.getName();
     private static final String OUR_FILE_NAME = "ChainedExceptions.java";
 
-    private static void check(StackTraceElement e, String methodName, int n) {
+    private static void check(Throwable t, StackTraceElement e, String methodName, int n) {
         if (!e.getClassName().equals(OUR_CLASS))
-            throw new RuntimeException("Class: " + e);
+            throw new RuntimeException("Class: " + e, t);
         if (!e.getMethodName().equals(methodName))
-            throw new RuntimeException("Method name: " + e);
+            throw new RuntimeException("Method name: " + e, t);
         if (!e.getFileName().equals(OUR_FILE_NAME))
-            throw new RuntimeException("File name: " + e);
+            throw new RuntimeException("File name: " + e, t);
         if (e.getLineNumber() != n)
-            throw new RuntimeException("Line number: " + e);
+            throw new RuntimeException("Line number: " + e, t);
     }
 }