Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Creating tag for second 2.7.1.RC2 release

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/tags/R_2_7_1_RC2@14793 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
  • Loading branch information...
commit 2e12f68df89b1aea8b051ad5b6def88a9ee88cc5 2 parents dabbd75 + 2e5a7bd
rytz authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/actors/scala/actors/Future.scala
View
4 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)

0 comments on commit 2e12f68

Please sign in to comment.
Something went wrong with that request. Please try again.