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

Comparing jsr166/src/main/java/util/concurrent/ForkJoinTask.java (file contents):
Revision 1.148 by jsr166, Sun Dec 6 18:10:46 2020 UTC vs.
Revision 1.149 by dl, Sun Jan 31 13:35:43 2021 UTC

# Line 469 | Line 469 | public abstract class ForkJoinTask<V> im
469              if ((!timed || p.isSaturated()) &&
470                  ((this instanceof CountedCompleter) ?
471                   (s = p.helpComplete(this, q, internal)) < 0 :
472 <                 (q.tryRemove(this, internal) && (s = doExec()) < 0)))
472 >                 (!ran &&
473 >                  (!internal && q.externalTryUnpush(this)) ||
474 >                  q.tryRemove(this, internal)) &&
475 >                 (s = doExec()) < 0))
476                  return s;
477              if (internal) {
478                  if ((s = p.helpJoin(this, q)) < 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines