diff options
| author | Aleksandar Prokopec <aleksandar.prokopec@gmail.com> | 2011-12-07 15:01:25 +0100 |
|---|---|---|
| committer | Aleksandar Prokopec <aleksandar.prokopec@gmail.com> | 2011-12-07 15:01:25 +0100 |
| commit | 35b8d97cc339fe8b6499bf2d8897f9dd74ad071c (patch) | |
| tree | 70759009da5a82c85bac0bd9b9914080c67fe7cd | |
| parent | 83d0ece42e4f0c5e41e3acae61e8e41db95defc5 (diff) | |
| download | scala-35b8d97cc339fe8b6499bf2d8897f9dd74ad071c.tar.gz scala-35b8d97cc339fe8b6499bf2d8897f9dd74ad071c.tar.bz2 scala-35b8d97cc339fe8b6499bf2d8897f9dd74ad071c.zip | |
The isTimedout on fj futures fixed.
| -rw-r--r-- | src/library/scala/concurrent/ForkJoinTaskImpl.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/ForkJoinTaskImpl.scala b/src/library/scala/concurrent/ForkJoinTaskImpl.scala index bc09644aca..faa7ecb45a 100644 --- a/src/library/scala/concurrent/ForkJoinTaskImpl.scala +++ b/src/library/scala/concurrent/ForkJoinTaskImpl.scala @@ -89,7 +89,7 @@ extends RecursiveAction with Task[T] with Future[T] { this } - def isTimedout: Boolean = updater.get() match { + def isTimedout: Boolean = updater.get(this) match { case Failure(ft: FutureTimeoutException) => true case _ => false } |