From 98c4febac8dcaad0383777ec023be768e3852182 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 17 Jan 2012 01:29:24 +0100 Subject: [PATCH] Clarified Future.or semantics --- akka-actor/src/main/scala/akka/dispatch/Future.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 91c7b2356a..dcd0f46629 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -421,7 +421,8 @@ sealed trait Future[+T] extends japi.Future[T] with Await.Awaitable[T] { /** * Returns a new Future that is either the successful result of this Future, the successful result of that Future, - * or the failure from either this or that. + * or the failure from either this or that. In case fails, and the other never completes, + * the returned Future will never be completed. */ def or[U >: T](that: Future[U]): Future[U] = { val p = Promise[U]()