Replaced TimerThread with java.util.Timer.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala
index d796c15dcd..9347131ad9 100644
--- a/src/actors/scala/actors/Future.scala
+++ b/src/actors/scala/actors/Future.scala
@@ -72,7 +72,10 @@ object Futures {
    * </p>
    */
   def awaitAll(timeout: Long, fts: Future[Any]*): List[Option[Any]] = {
-    TimerThread.requestTimeout(Actor.self, null, timeout)
+    val thisActor = Actor.self
+    Actor.timer.schedule(new java.util.TimerTask {
+      def run() { thisActor ! TIMEOUT }
+    }, timeout)
 
     var resultsMap: collection.mutable.Map[Int, Option[Any]] = new collection.mutable.HashMap[Int, Option[Any]]