Merge branch 'master' into wip-2344-agent-love-√

2012-08-06 17:24:03 +02:00 · 2012-08-06 17:24:03 +02:00 · 757b4555e4
commit 757b4555e4
parent cc3f576f0a 2fd04db55e
36 changed files with 220 additions and 139 deletions
--- a/akka-docs/java/code/docs/future/FutureDocTestBase.java
+++ b/akka-docs/java/code/docs/future/FutureDocTestBase.java
@ -86,7 +86,7 @@ public class FutureDocTestBase {
      ExecutorService yourExecutorServiceGoesHere = Executors.newSingleThreadExecutor();
      //#diy-execution-context
      ExecutionContext ec =
-        ExecutionContext$.MODULE$.fromExecutorService(yourExecutorServiceGoesHere);
+        ExecutionContexts.fromExecutorService(yourExecutorServiceGoesHere);

      //Use ec with your Futures
      Future<String> f1 = Futures.successful("foo");