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.35 by jsr166, Mon May 2 18:38:53 2005 UTC vs.
Revision 1.36 by dl, Wed May 11 23:47:58 2005 UTC

# Line 265 | Line 265 | public class FutureTask<V> implements Fu
265                  return;
266              try {
267                  runner = Thread.currentThread();
268 <                innerSet(callable.call());
268 >                if (getState() == RUNNING)
269 >                    innerSet(callable.call());
270 >                else
271 >                    runner = null;
272              } catch (Throwable ex) {
273                  innerSetException(ex);
274              }
# Line 276 | Line 279 | public class FutureTask<V> implements Fu
279                  return false;
280              try {
281                  runner = Thread.currentThread();
282 <                callable.call(); // don't set result
282 >                if (getState() == RUNNING)
283 >                    callable.call(); // don't set result
284                  runner = null;
285                  return compareAndSetState(RUNNING, 0);
286              } catch (Throwable ex) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines