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

Comparing jsr166/src/main/java/util/concurrent/FutureTask.java (file contents):
Revision 1.90 by jsr166, Sun Jun 19 15:50:17 2011 UTC vs.
Revision 1.91 by jsr166, Sun Jun 19 16:00:03 2011 UTC

# Line 155 | Line 155 | public class FutureTask<V> implements Ru
155       */
156      public V get() throws InterruptedException, ExecutionException {
157          int s = state;
158 <        return report((s <= COMPLETING) ? awaitDone(false, 0L) : s);
158 >        if (s <= COMPLETING)
159 >            s = awaitDone(false, 0L);
160 >        return report(s);
161      }
162  
163      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines