summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2009-12-21 16:36:37 +0000
committerPhilipp Haller <hallerp@gmail.com>2009-12-21 16:36:37 +0000
commitf9a751e444ba479710bde403ab47d0b3937a8c12 (patch)
treeedbca4dba645f378139f2c729aaf916339e42f2e /src
parent348fd6e69ae96b5d8187e1f25372c0908a5ce218 (diff)
downloadscala-f9a751e444ba479710bde403ab47d0b3937a8c12.tar.gz
scala-f9a751e444ba479710bde403ab47d0b3937a8c12.tar.bz2
scala-f9a751e444ba479710bde403ab47d0b3937a8c12.zip
small correction in doc comment. no review.
Diffstat (limited to 'src')
-rw-r--r--src/actors/scala/actors/Future.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala
index 70bcde9380..c3c12915e9 100644
--- a/src/actors/scala/actors/Future.scala
+++ b/src/actors/scala/actors/Future.scala
@@ -105,9 +105,8 @@ object Futures {
* aborted
* @param fts the futures to be awaited
* @return the list of optional future values
- * @throws `java.lang.IllegalArgumentException` if timeout
- * is negative, or timeout + `System.currentTimeMillis()`
- * is negative.
+ * @throws java.lang.IllegalArgumentException if timeout is negative,
+ * or timeout + `System.currentTimeMillis()` is negative.
*/
def awaitAll(timeout: Long, fts: Future[Any]*): List[Option[Any]] = {
var resultsMap: collection.mutable.Map[Int, Option[Any]] = new collection.mutable.HashMap[Int, Option[Any]]