Merge branch 'master' of github.com:jboner/akka

2011-06-17 09:54:56 +02:00 · 2011-06-17 09:54:56 +02:00 · d2c80a4b54
commit d2c80a4b54
parent b5d3a67355 a41737e197
1 changed files with 1 additions and 1 deletions
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@ -610,7 +610,7 @@ sealed trait Future[+T] {
  }

  /**
-   * Returns the current result, throws the exception is one has been raised, else returns None
+   * Returns the current result, throws the exception if one has been raised, else returns None
   */
  final def resultOrException: Option[T] = {
    val v = value