--- jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2009/11/16 04:57:10	1.29
+++ jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2009/11/17 13:40:14	1.31
@@ -29,7 +29,7 @@ public class ReentrantReadWriteLockTest
         public void run() {
             try {
                 lock.writeLock().lockInterruptibly();
-            } catch (InterruptedException success){}
+            } catch (InterruptedException success) {}
         }
     }
 
@@ -45,7 +45,7 @@ public class ReentrantReadWriteLockTest
             try {
                 lock.writeLock().lockInterruptibly();
                 threadShouldThrow();
-            } catch (InterruptedException success){}
+            } catch (InterruptedException success) {}
         }
     }
 
@@ -181,7 +181,7 @@ public class ReentrantReadWriteLockTest
 	try {
 	    rl.writeLock().unlock();
 	    shouldThrow();
-	} catch (IllegalMonitorStateException success){}
+	} catch (IllegalMonitorStateException success) {}
     }
 
 
@@ -197,7 +197,7 @@ public class ReentrantReadWriteLockTest
                         lock.writeLock().unlock();
 			lock.writeLock().lockInterruptibly();
                         lock.writeLock().unlock();
-		    } catch (InterruptedException success){}
+		    } catch (InterruptedException success) {}
 		}
 	    });
         try {
@@ -208,7 +208,7 @@ public class ReentrantReadWriteLockTest
             Thread.sleep(SHORT_DELAY_MS);
             lock.writeLock().unlock();
             t.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -223,7 +223,7 @@ public class ReentrantReadWriteLockTest
                 public void run() {
                     try {
 			lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
-		    } catch (InterruptedException success){}
+		    } catch (InterruptedException success) {}
 		}
 	    });
         try {
@@ -231,7 +231,7 @@ public class ReentrantReadWriteLockTest
             t.interrupt();
             lock.writeLock().unlock();
             t.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -246,7 +246,7 @@ public class ReentrantReadWriteLockTest
                 public void run() {
                     try {
 			lock.readLock().lockInterruptibly();
-		    } catch (InterruptedException success){}
+		    } catch (InterruptedException success) {}
 		}
 	    });
         try {
@@ -256,7 +256,7 @@ public class ReentrantReadWriteLockTest
             Thread.sleep(SHORT_DELAY_MS);
             lock.writeLock().unlock();
             t.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -272,14 +272,14 @@ public class ReentrantReadWriteLockTest
                     try {
 			lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
 			threadShouldThrow();
-		    } catch (InterruptedException success){}
+		    } catch (InterruptedException success) {}
 		}
 	    });
         try {
             t.start();
             t.interrupt();
             t.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -300,7 +300,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.writeLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -320,7 +320,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.writeLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -341,7 +341,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.readLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -375,7 +375,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -409,7 +409,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -459,7 +459,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -498,7 +498,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -538,7 +538,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -589,7 +589,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -629,7 +629,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -672,7 +672,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(!t1.isAlive());
             assertTrue(!t2.isAlive());
 
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -694,7 +694,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.readLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -716,7 +716,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.readLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -738,7 +738,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.readLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -760,7 +760,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.readLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -786,7 +786,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.writeLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -810,7 +810,7 @@ public class ReentrantReadWriteLockTest
             t.start();
             t.join();
             lock.writeLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -843,7 +843,7 @@ public class ReentrantReadWriteLockTest
             Thread.sleep(SHORT_DELAY_MS);
             t.join();
             lock.writeLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -874,7 +874,7 @@ public class ReentrantReadWriteLockTest
             t.interrupt();
             t.join();
             lock.writeLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -1216,7 +1216,7 @@ public class ReentrantReadWriteLockTest
             ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
             r.readLock().lock();
             r.readLock().unlock();
-        } catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             unexpectedException();
         }
@@ -1246,7 +1246,7 @@ public class ReentrantReadWriteLockTest
             assertFalse(lock.hasQueuedThreads());
             t1.join();
             t2.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -1292,7 +1292,7 @@ public class ReentrantReadWriteLockTest
             assertFalse(sync.hasQueuedThread(t2));
             t1.join();
             t2.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -1322,7 +1322,7 @@ public class ReentrantReadWriteLockTest
             assertEquals(0, lock.getQueueLength());
             t1.join();
             t2.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -1354,7 +1354,7 @@ public class ReentrantReadWriteLockTest
             assertTrue(lock.getQueuedThreads().isEmpty());
             t1.join();
             t2.join();
-        } catch (Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -1407,7 +1407,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testHasWaitersIAE() {
 	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
 	final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
         try {
             lock2.hasWaiters(c);
@@ -1423,7 +1423,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testHasWaitersIMSE() {
 	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
         try {
             lock.hasWaiters(c);
             shouldThrow();
@@ -1439,7 +1439,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testGetWaitQueueLengthIAE() {
 	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
 	final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
         try {
             lock2.getWaitQueueLength(c);
@@ -1455,7 +1455,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testGetWaitQueueLengthIMSE() {
 	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
         try {
             lock.getWaitQueueLength(c);
             shouldThrow();
@@ -1471,7 +1471,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testGetWaitingThreadsIAE() {
 	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
 	final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
         try {
             lock2.getWaitingThreads(c);
@@ -1487,7 +1487,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testGetWaitingThreadsIMSE() {
 	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
         try {
             lock.getWaitingThreads(c);
             shouldThrow();
@@ -1503,7 +1503,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testHasWaiters() {
 	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
 	Thread t = new Thread(new Runnable() {
 		public void run() {
 		    try {
@@ -1545,7 +1545,7 @@ public class ReentrantReadWriteLockTest
      */
     public void testGetWaitQueueLength() {
 	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-        final Condition c = (lock.writeLock().newCondition());
+        final Condition c = lock.writeLock().newCondition();
 	Thread t = new Thread(new Runnable() {
 		public void run() {
 		    try {