Merge branch 'wip-remove-timeout-jboner' into master

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2011-12-14 22:46:43 +01:00
commit a18206b81a
28 changed files with 96 additions and 61 deletions

View file

@ -1,6 +1,6 @@
package akka.dispatch;
import akka.actor.Timeout;
import akka.util.Timeout;
import akka.actor.ActorSystem;
import akka.japi.*;
@ -21,7 +21,7 @@ public class JavaFutureTests {
private static ActorSystem system;
private static Timeout t;
private final Duration timeout = Duration.create(5, TimeUnit.SECONDS);
@BeforeClass