summaryrefslogtreecommitdiff
path: root/src/actors/scala/actors/Future.scala
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2009-11-03 13:05:20 +0000
committerPhilipp Haller <hallerp@gmail.com>2009-11-03 13:05:20 +0000
commit04fb01d1315c39cc316f1e16715110a7f3c116cb (patch)
tree647071466243343c25d596cf3b3bcedbdab21697 /src/actors/scala/actors/Future.scala
parent621da8e1ff8cebfada253e287b8f41bbd3eb8e23 (diff)
downloadscala-04fb01d1315c39cc316f1e16715110a7f3c116cb.tar.gz
scala-04fb01d1315c39cc316f1e16715110a7f3c116cb.tar.bz2
scala-04fb01d1315c39cc316f1e16715110a7f3c116cb.zip
Fix and test for #2530.
Diffstat (limited to 'src/actors/scala/actors/Future.scala')
-rw-r--r--src/actors/scala/actors/Future.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala
index e26b0b02df..38b268d795 100644
--- a/src/actors/scala/actors/Future.scala
+++ b/src/actors/scala/actors/Future.scala
@@ -127,7 +127,8 @@ object Futures {
Actor.receive(reaction)
}
- awaitWith(partFuns)
+ if (partFuns.length > 0)
+ awaitWith(partFuns)
var results: List[Option[Any]] = Nil
val size = resultsMap.size