diff --git a/test/ProblemList.txt b/test/ProblemList.txt index 9c5c29b07bce130c14aefee4eecf26b4a3bd2b96..25358b4035bc98c5a0a95c8b3c1646bb74ec4289 100644 --- a/test/ProblemList.txt +++ b/test/ProblemList.txt @@ -275,9 +275,6 @@ tools/launcher/FXLauncherTest.java linux-all # jdk_util -# Filed 6772009 -java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all - ############################################################################ # svc_tools diff --git a/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java b/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java index e942e1811bd8f32263492cd85233129b98ce2a7c..dd80d996a825a27b48e0cdb560a6881791915eff 100644 --- a/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java +++ b/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java @@ -49,14 +49,11 @@ import java.util.*; public final class CancelledLockLoops { static final Random rng = new Random(); static boolean print = false; - static final int ITERS = 1000000; + static final int ITERS = 5000000; static final long TIMEOUT = 100; public static void main(String[] args) throws Exception { - int maxThreads = 5; - if (args.length > 0) - maxThreads = Integer.parseInt(args[0]); - + int maxThreads = (args.length > 0) ? Integer.parseInt(args[0]) : 5; print = true; for (int i = 2; i <= maxThreads; i += (i+1) >>> 1) { @@ -90,7 +87,7 @@ public final class CancelledLockLoops { threads[i] = new Thread(this); for (int i = 0; i < threads.length; ++i) threads[i].start(); - Thread[] cancels = (Thread[]) (threads.clone()); + Thread[] cancels = threads.clone(); Collections.shuffle(Arrays.asList(cancels), rng); barrier.await(); Thread.sleep(TIMEOUT);