Merge pull request #884 from akka/wip-2729-√

#2729 - Removing uses of Future.either in favor of firstCompletedOf
This commit is contained in:
Viktor Klang (√) 2012-11-26 05:52:16 -08:00
commit 33a8297e0f
2 changed files with 3 additions and 3 deletions

View file

@ -43,10 +43,10 @@ import scala.concurrent.ExecutionContext$;
//#imports8
import static akka.pattern.Patterns.after;
import java.util.Arrays;
//#imports8
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -564,7 +564,7 @@ public class FutureDocTestBase {
return "foo";
}
}, ec);
Future<String> result = future.either(delayed);
Future<String> result = Futures.firstCompletedOf(Arrays.asList(future, delayed), ec);
//#after
Await.result(result, Duration.create(2, SECONDS));
}