--- jsr166/src/jsr166e/StampedLock.java	2012/10/13 23:05:13	1.12
+++ jsr166/src/jsr166e/StampedLock.java	2012/10/15 05:26:53	1.18
@@ -180,7 +180,7 @@ public class StampedLock implements java
      * read-locked.  The read count is ignored when validating
      * "optimistic" seqlock-reader-style stamps.  Because we must use
      * a small finite number of bits (currently 7) for readers, a
-     * supplementary reader overflow word is used when then number of
+     * supplementary reader overflow word is used when the number of
      * readers exceeds the count field. We do this by treating the max
      * reader count value (RBITS) as a spinlock protecting overflow
      * updates.
@@ -261,7 +261,7 @@ public class StampedLock implements java
     private static final int OVERFLOW_YIELD_RATE = 7; // must be power 2 - 1
 
     /** The number of bits to use for reader count before overflowing */
-    private static final int  LG_READERS = 7;
+    private static final int LG_READERS = 7;
 
     // Values for lock state and stamp operations
     private static final long RUNIT = 1L;
@@ -310,7 +310,7 @@ public class StampedLock implements java
     private transient int readerOverflow;
 
     /**
-     * Creates a new lock initially in unlocked state.
+     * Creates a new lock, initially in unlocked state.
      */
     public StampedLock() {
         state = ORIGIN;
@@ -334,7 +334,7 @@ public class StampedLock implements java
      * Exclusively acquires the lock if it is immediately available.
      *
      * @return a stamp that can be used to unlock or convert mode,
-     * or zero if the lock is not available.
+     * or zero if the lock is not available
      */
     public long tryWriteLock() {
         long s, next;
@@ -667,7 +667,7 @@ public class StampedLock implements java
             else if (m == WBIT) {
                 if (a != m)
                     break;
-                next = state = s + (WBIT + RUNIT);
+                state = next = s + (WBIT + RUNIT);
                 readerPrefSignal();
                 return next;
             }
@@ -701,7 +701,7 @@ public class StampedLock implements java
             else if (m == WBIT) {
                 if (a != m)
                     break;
-                next = state = (s += WBIT) == 0L ? ORIGIN : s;
+                state = next = (s += WBIT) == 0L ? ORIGIN : s;
                 readerPrefSignal();
                 return next;
             }