#2729 - Removing uses of Future.either in favor of firstCompletedOf

2012-11-21 20:33:54 +01:00 · 2012-11-21 20:33:54 +01:00 · f386c4136f
commit f386c4136f
parent 6a348e3c76
2 changed files with 3 additions and 3 deletions
--- a/akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala
@ -417,7 +417,7 @@ class FutureDocSpec extends AkkaSpec {
    val delayed = after(200 millis, using = system.scheduler)(Future.failed(
      new IllegalStateException("OHNOES")))
    val future = Future { Thread.sleep(1000); "foo" }
-    val result = future either delayed
+    val result = Future firstCompletedOf Seq(future, delayed)
    //#after
    intercept[IllegalStateException] { Await.result(result, 2 second) }
  }