6772009: java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java test failed with 'Completed != 2'
Reviewed-by: martin, dholmes
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 9c5c29b..25358b4 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -275,9 +275,6 @@
# jdk_util
-# Filed 6772009
-java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all
-
############################################################################
# svc_tools
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java
index e942e18..dd80d99 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java
@@ -49,14 +49,11 @@
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 @@
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);
