Move Timeout into actor package to make more accessible, use overloaded '?' method to handle explicit Timeout

2011-06-28 15:20:31 -06:00 · 2011-06-28 15:20:31 -06:00 · ccb8440912
commit ccb8440912
parent 81b361e6d7
10 changed files with 48 additions and 51 deletions
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@ -90,7 +90,7 @@ trait MessageDispatcher {
    dispatch(invocation)
  }

-  private[akka] final def dispatchFuture[T](block: () ⇒ T, timeout: Actor.Timeout): Future[T] = {
+  private[akka] final def dispatchFuture[T](block: () ⇒ T, timeout: Timeout): Future[T] = {
    futures.getAndIncrement()
    try {
      val future = new DefaultPromise[T](timeout)