--- jsr166/src/test/tck/JSR166TestCase.java	2010/10/29 06:58:56	1.67
+++ jsr166/src/test/tck/JSR166TestCase.java	2010/11/19 00:20:12	1.69
@@ -289,7 +289,7 @@ public class JSR166TestCase extends Test
      * earlier by threadRecordFailure.
      */
     public void tearDown() throws Exception {
-        Throwable t = threadFailure.get();
+        Throwable t = threadFailure.getAndSet(null); 
         if (t != null) {
             if (t instanceof Error)
                 throw (Error) t;
@@ -636,7 +636,7 @@ public class JSR166TestCase extends Test
     long millisElapsedSince(long startNanoTime) {
         return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
     }
-    
+
     /**
      * Returns a new started daemon Thread running the given runnable.
      */