diff options
author | Philipp Haller <hallerp@gmail.com> | 2008-04-21 16:48:40 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2008-04-21 16:48:40 +0000 |
commit | 1e5d8760f66e05a4a4d92d7d09986d881296daaf (patch) | |
tree | f75261c01ca21cb606bd78ecd7f0da5b3d4104ae /src/actors | |
parent | 1e277487f5084148eb6922002ce754f3fc9d9cb6 (diff) | |
download | scala-1e5d8760f66e05a4a4d92d7d09986d881296daaf.tar.gz scala-1e5d8760f66e05a4a4d92d7d09986d881296daaf.tar.bz2 scala-1e5d8760f66e05a4a4d92d7d09986d881296daaf.zip |
fixed #779
Diffstat (limited to 'src/actors')
-rw-r--r-- | src/actors/scala/actors/Future.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala index d3ba1be380..14c838bf0f 100644 --- a/src/actors/scala/actors/Future.scala +++ b/src/actors/scala/actors/Future.scala @@ -71,6 +71,8 @@ object Futures { * </p> */ def awaitAll(timeout: Long, fts: Future[Any]*): List[Option[Any]] = { + TimerThread.requestTimeout(Actor.self, null, timeout) + var resultsMap: collection.mutable.Map[Int, Option[Any]] = new collection.mutable.HashMap[Int, Option[Any]] var cnt = 0 @@ -111,7 +113,7 @@ object Futures { } } } - Actor.receiveWithin(timeout)(reaction) + Actor.receive(reaction) } awaitWith(partFuns) |