ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/Phaser.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/Phaser.java (file contents):
Revision 1.83 by jsr166, Sun Sep 20 17:03:23 2015 UTC vs.
Revision 1.84 by jsr166, Mon Sep 28 18:35:19 2015 UTC

# Line 1087 | Line 1087 | public class Phaser {
1087                  thread = null;
1088                  return true;
1089              }
1090 <            if (timed) {
1091 <                if (nanos > 0L) {
1092 <                    nanos = deadline - System.nanoTime();
1093 <                }
1094 <                if (nanos <= 0L) {
1095 <                    thread = null;
1096 <                    return true;
1097 <                }
1090 >            if (timed &&
1091 >                (nanos <= 0L || (nanos = deadline - System.nanoTime()) <= 0L)) {
1092 >                thread = null;
1093 >                return true;
1094              }
1095              return false;
1096          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines