raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Clarified Future.or semantics

Browse source
This commit is contained in:
Viktor Klang 2012-01-17 01:29:24 +01:00
parent 1f4954755d
commit 98c4febac8
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-actor/src/main/scala/akka/dispatch/Future.scala
View file

@ -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]()