--- jsr166/src/jsr166e/StampedLock.java	2012/10/13 11:51:12	1.8
+++ jsr166/src/jsr166e/StampedLock.java	2012/10/15 05:26:53	1.18
@@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * A capability-based lock with three modes for controlling read/write
- * access.  The state of a StampedLock consists of a version and
- * mode. Lock acquisition methods return a stamp that represents and
+ * access.  The state of a StampedLock consists of a version and mode.
+ * Lock acquisition methods return a stamp that represents and
  * controls access with respect to a lock state; "try" versions of
  * these methods may instead return the special value zero to
  * represent failure to acquire access. Lock release and conversion
@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
  * <p>This class also supports methods that conditionally provide
  * conversions across the three modes. For example, method {@link
  * #tryConvertToWriteLock} attempts to "upgrade" a mode, returning
- * valid write stamp if (1) already in writing mode (2) in reading
+ * a valid write stamp if (1) already in writing mode (2) in reading
  * mode and there are no other readers or (3) in optimistic mode and
  * the lock is available. The forms of these methods are designed to
  * help reduce some of the code bloat that otherwise occurs in
@@ -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;
@@ -539,7 +539,7 @@ public class StampedLock implements java
     }
 
     /**
-     * If the lock state matches the given stamp, releases
+     * If the lock state matches the given stamp, releases the
      * non-exclusive lock.
      *
      * @param stamp a stamp returned by a read-lock operation
@@ -606,10 +606,11 @@ public class StampedLock implements java
     /**
      * If the lock state matches the given stamp then performs one of
      * the following actions. If the stamp represents holding a write
-     * lock, returns it. Or, if a read lock, if the write lock is
-     * available, releases the read and returns a write stamp. Or, if
-     * an optimistic read, returns a write stamp only if immediately
-     * available. This method returns zero in all other cases.
+     * lock, returns it.  Or, if a read lock, if the write lock is
+     * available, releases the read lock and returns a write stamp.
+     * Or, if an optimistic read, returns a write stamp only if
+     * immediately available. This method returns zero in all other
+     * cases.
      *
      * @param stamp a stamp
      * @return a valid write stamp, or zero on failure
@@ -666,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;
             }
@@ -700,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;
             }