1 files changed, 12 insertions, 3 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/ThreadLocalTest.java b/jsr166-tests/src/test/java/jsr166/ThreadLocalTest.java
index 885c2b2b22..7f5f0724db 100644
--- a/jsr166-tests/src/test/java/jsr166/ThreadLocalTest.java
+++ b/jsr166-tests/src/test/java/jsr166/ThreadLocalTest.java
@@ -8,10 +8,19 @@
 
 package jsr166;
 
-import junit.framework.*;
-import java.util.concurrent.Semaphore;
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class ThreadLocalTest extends JSR166TestCase {
+    // android-note: Removed because the CTS runner does a bad job of
+    // retrying tests that have suite() declarations.
+    //
+    // public static void main(String[] args) {
+    //     main(suite(), args);
+    // }
+    // public static Test suite() {
+    //     return new TestSuite(...);
+    // }
 
     static ThreadLocal<Integer> tl = new ThreadLocal<Integer>() {
             public Integer initialValue() {
@@ -85,7 +94,7 @@ public class ThreadLocalTest extends JSR166TestCase {
      */
     public void testGenericITL() throws InterruptedException {
         final int threadCount = 10;
-        final int x[] = new int[threadCount];
+        final int[] x = new int[threadCount];
         Thread progenitor = new ITLThread(x);
         progenitor.start();
         progenitor.join();