--- jsr166/src/test/loops/TimeoutProducerConsumerLoops.java	2009/11/16 04:16:43	1.6
+++ jsr166/src/test/loops/TimeoutProducerConsumerLoops.java	2016/12/31 21:34:47	1.15
@@ -1,11 +1,21 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import java.util.concurrent.*;
-
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
 
 public class TimeoutProducerConsumerLoops {
     static final int NCPUS = Runtime.getRuntime().availableProcessors();
@@ -51,8 +61,7 @@ public class TimeoutProducerConsumerLoop
             maxPairs = Integer.parseInt(args[0]);
 
         print = true;
-        int k = 1;
-        for (int i = 1; i <= maxPairs;) {
+        for (int k = 1, i = 1; i <= maxPairs;) {
             System.out.println("Pairs:" + i);
             oneTest(i, iters);
             Thread.sleep(100);
@@ -64,7 +73,7 @@ public class TimeoutProducerConsumerLoop
                 i = k;
         }
         pool.shutdown();
-   }
+    }
 
     static void oneTest(int n, int iters) throws Exception {
         if (print)
@@ -106,15 +115,14 @@ public class TimeoutProducerConsumerLoop
         if (print)
             System.out.print("ArrayBlockingQueue(fair) ");
         oneRun(new ArrayBlockingQueue<Integer>(POOL_SIZE, true), n, iters/16);
-
     }
 
-    static abstract class Stage implements Runnable {
+    abstract static class Stage implements Runnable {
         final int iters;
         final BlockingQueue<Integer> queue;
         final CyclicBarrier barrier;
         final Phaser lagPhaser;
-        Stage (BlockingQueue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
+        Stage(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
             queue = q;
             barrier = b;
             lagPhaser = s;
@@ -216,8 +224,8 @@ public class TimeoutProducerConsumerLoop
     static final class LTQasSQ<T> extends LinkedTransferQueue<T> {
         LTQasSQ() { super(); }
         public void put(T x) {
-            try { super.transfer(x);
-            } catch (InterruptedException ex) { throw new Error(); }
+            try { super.transfer(x); }
+            catch (InterruptedException ex) { throw new Error(ex); }
         }
 
         public boolean offer(T x, long timeout, TimeUnit unit) {