diff options
| -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) |