ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/StampedLock.java
(Generate patch)

Comparing jsr166/src/jsr166e/StampedLock.java (file contents):
Revision 1.22 by jsr166, Wed Oct 17 00:02:47 2012 UTC vs.
Revision 1.24 by jsr166, Sun Nov 25 21:40:11 2012 UTC

# Line 156 | Line 156 | import java.util.concurrent.TimeUnit;
156   *         }
157   *       }
158   *     } finally {
159 < *        sl.unlock(stamp);
159 > *       sl.unlock(stamp);
160   *     }
161   *   }
162   * }}</pre>
# Line 995 | Line 995 | public class StampedLock implements java
995                          else if ((time = deadline - System.nanoTime()) <= 0L)
996                              return cancelWriter(node, false);
997                          if (node.prev == p && p.status == WAITING &&
998 <                            (p != whead || (state & WBIT) != 0L)) // recheck
998 >                            (p != whead || (state & ABITS) != 0L)) // recheck
999                              U.park(false, time);
1000                          if (interruptible && Thread.interrupted())
1001                              return cancelWriter(node, true);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines