These minor regression test improvements have been sitting around too long.
They should be put back.

--- /u/martin/ws/mustang/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java 2004-08-27 16:20:06.935797000 -0700
+++ /u/martin/ws/jsr166/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java 2005-11-27 20:59:57.776282000 -0800
@@ -1,5 +1,5 @@
 /*
- * @test 1.3 04/01/12
+ * @test %I% %E%
  * @bug 4486658
  * @compile -source 1.5 CancelledProducerConsumerLoops.java
  * @run main/timeout=7000 CancelledProducerConsumerLoops
@@ -102,14 +101,14 @@
             System.out.print("SynchronousQueue ");
         oneRun(new SynchronousQueue<Integer>(), pairs, iters / 8);
 
- /*
+ /* PriorityBlockingQueue is unbounded
         if (print)
             System.out.print("PriorityBlockingQueue ");
- oneRun(new PriorityBlockingQueue<Integer>(ITERS / 2 * pairs), pairs, iters / 4);
+ oneRun(new PriorityBlockingQueue<Integer>(iters / 2 * pairs), pairs, iters / 4);
         */
     }
     
- static abstract class Stage implements Callable {
+ static abstract class Stage implements Callable<Integer> {
         final BlockingQueue<Integer> queue;
         final CyclicBarrier barrier;
         final int iters;
@@ -125,7 +124,7 @@
             super(q, b, iters);
         }
 
- public Object call() throws Exception {
+ public Integer call() throws Exception {
             barrier.await();
             int s = 0;
             int l = 4321;
@@ -144,7 +143,7 @@
             super(q, b, iters);
         }
 
- public Object call() throws Exception {
+ public Integer call() throws Exception {
             barrier.await();
             int l = 0;
             int s = 0;