From fbdf67b3160c70679bf963836b4c8cc25d5efc9d Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 21 Aug 2012 09:01:04 +0200
Subject: [PATCH] Incorparate review comments, see #2410

---
 akka-docs/java/code/docs/future/FutureDocTestBase.java | 3 +--
 akka-docs/scala/code/docs/future/FutureDocSpec.scala   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/akka-docs/java/code/docs/future/FutureDocTestBase.java b/akka-docs/java/code/docs/future/FutureDocTestBase.java
index 6454926e9b..9ee643c17e 100644
--- a/akka-docs/java/code/docs/future/FutureDocTestBase.java
+++ b/akka-docs/java/code/docs/future/FutureDocTestBase.java
@@ -526,8 +526,7 @@ public class FutureDocTestBase {
         return "foo";
       }
     }, ec);
-    Future<String> result = Futures.firstCompletedOf(
-      Arrays.asList(future, delayed), ec);
+    Future<String> result = future.either(delayed);
     //#after
     Await.result(result, Duration.create(2, SECONDS));
   }
diff --git a/akka-docs/scala/code/docs/future/FutureDocSpec.scala b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
index 908a33523b..dc28fd7185 100644
--- a/akka-docs/scala/code/docs/future/FutureDocSpec.scala
+++ b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
@@ -381,10 +381,10 @@ class FutureDocSpec extends AkkaSpec {
     //#after
     import akka.pattern.after
 
-    val delayed = after(500 millis, using = system.scheduler)(Promise.failed(
-      new IllegalStateException("OHNOES")).future)
+    val delayed = after(200 millis, using = system.scheduler)(Future.failed(
+      new IllegalStateException("OHNOES")))
     val future = Future { Thread.sleep(1000); "foo" }
-    val result = Future.firstCompletedOf(Seq(Promise[String]().future, delayed))
+    val result = future either delayed
     //#after
     intercept[IllegalStateException] { Await.result(result, 2 second) }
   }