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

Comparing jsr166/src/main/java/util/concurrent/ForkJoinPool.java (file contents):
Revision 1.152 by dl, Sun Feb 10 19:57:53 2013 UTC vs.
Revision 1.153 by jsr166, Mon Feb 11 06:41:08 2013 UTC

# Line 81 | Line 81 | import java.util.concurrent.TimeUnit;
81   *    <td ALIGN=CENTER> <b>Call from within fork/join computations</b></td>
82   *  </tr>
83   *  <tr>
84 < *    <td> <b>Arrange async execution</td>
84 > *    <td> <b>Arrange async execution</b></td>
85   *    <td> {@link #execute(ForkJoinTask)}</td>
86   *    <td> {@link ForkJoinTask#fork}</td>
87   *  </tr>
88   *  <tr>
89 < *    <td> <b>Await and obtain result</td>
89 > *    <td> <b>Await and obtain result</b></td>
90   *    <td> {@link #invoke(ForkJoinTask)}</td>
91   *    <td> {@link ForkJoinTask#invoke}</td>
92   *  </tr>
93   *  <tr>
94 < *    <td> <b>Arrange exec and obtain Future</td>
94 > *    <td> <b>Arrange exec and obtain Future</b></td>
95   *    <td> {@link #submit(ForkJoinTask)}</td>
96   *    <td> {@link ForkJoinTask#fork} (ForkJoinTasks <em>are</em> Futures)</td>
97   *  </tr>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines