--- jsr166/src/test/loops/CheckedLockLoops.java 2011/03/15 19:47:05 1.8 +++ jsr166/src/test/loops/CheckedLockLoops.java 2015/01/15 18:34:18 1.11 @@ -8,9 +8,9 @@ * @summary basic safety and liveness of ReentrantLocks, and other locks based on them */ +import java.util.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; -import java.util.*; public final class CheckedLockLoops { static final ExecutorService pool = Executors.newCachedThreadPool(); @@ -31,8 +31,7 @@ public final class CheckedLockLoops { static void runTest(int maxThreads, int iters) throws Exception { print = true; - int k = 1; - for (int i = 1; i <= maxThreads;) { + for (int k = 1, i = 1; i <= maxThreads;) { System.out.println("Threads:" + i); oneTest(i, iters / i); if (i == k) { @@ -399,7 +398,6 @@ public final class CheckedLockLoops { } - private static class FairReentrantReadWriteLockLoop extends LockLoop { private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true); final int loop(int n) {