Enormous merge with master which probably led to the indirect unfortunate deaths of several kittens

akka-docs/java/code/akka/docs/actor/UntypedActorTestBase.java

@@ -9,6 +9,8 @@ import akka.actor.Props;
 
 //#import-future
 import akka.dispatch.Future;
+import akka.dispatch.Await;
+import akka.util.Duration;
 
 //#import-future
 
@@ -28,8 +30,9 @@ import akka.actor.UntypedActorFactory;
 import akka.dispatch.MessageDispatcher;
 
 import org.junit.Test;
-
 import scala.Option;
+import java.lang.Object;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.*;
 
@@ -93,17 +96,8 @@ public class UntypedActorTestBase {
     }));
 
     //#using-ask
-    Future future = myActor.ask("Hello", 1000);
-    future.await();
-    if (future.isCompleted()) {
-      Option resultOption = future.result();
-      if (resultOption.isDefined()) {
-        Object result = resultOption.get();
-        // ...
-      } else {
-        //...  whatever
-      }
-    }
+    Future<Object> future = myActor.ask("Hello", 1000);
+    Object result = Await.result(future, Duration.create(1, TimeUnit.SECONDS));
     //#using-ask
     system.shutdown();
   }