From 6e45ab7c17e8a11d593540eb9793e3c7dafceafd Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 23 Apr 2011 11:35:54 +0200 Subject: [PATCH 1/2] add Future.empty[T] --- akka-actor/src/main/scala/akka/dispatch/Future.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 60d956e07c..0f44fb27c0 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -246,6 +246,11 @@ object Future { def !(msg: Any) = future << msg } + /** + * Create an empty Future with default timeout + */ + def empty[T](timeout : Long = Actor.TIMEOUT) = new DefaultCompletableFuture[T](timeout) + import scala.collection.mutable.Builder import scala.collection.generic.CanBuildFrom From 33f05856c1434dfcd3861b7de9236bf43cc2238c Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 23 Apr 2011 11:49:03 +0200 Subject: [PATCH 2/2] use Future.empty in Future.channel --- akka-actor/src/main/scala/akka/dispatch/Future.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 0f44fb27c0..2b3fc6425d 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -242,7 +242,7 @@ object Future { * Construct a completable channel */ def channel(timeout: Long = Actor.TIMEOUT) = new Channel[Any] { - val future = new DefaultCompletableFuture[Any](timeout) + val future = empty[Any](timeout) def !(msg: Any) = future << msg }