summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-05-14 17:00:54 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-05-14 17:00:54 -0700
commit487584caa97d0905df06e32c292c00fcd82a2fa3 (patch)
treea3ab7c59a1a06a6e78727ebbf7fd7aee8438ad37 /src
parent76b872475f0e8b847ccda1000db8f815c69deacb (diff)
parentb32d294e14615bea0c062dd61350f8ab6a05b8dc (diff)
downloadscala-487584caa97d0905df06e32c292c00fcd82a2fa3.tar.gz
scala-487584caa97d0905df06e32c292c00fcd82a2fa3.tar.bz2
scala-487584caa97d0905df06e32c292c00fcd82a2fa3.zip
Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-apply-2.10-√
SI-7383 - call ExecutionContext.prepare in Future.apply
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/concurrent/impl/Future.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/impl/Future.scala b/src/library/scala/concurrent/impl/Future.scala
index 8c2a77c75f..89d10e5c47 100644
--- a/src/library/scala/concurrent/impl/Future.scala
+++ b/src/library/scala/concurrent/impl/Future.scala
@@ -28,7 +28,7 @@ private[concurrent] object Future {
def apply[T](body: =>T)(implicit executor: ExecutionContext): scala.concurrent.Future[T] = {
val runnable = new PromiseCompletingRunnable(body)
- executor.execute(runnable)
+ executor.prepare.execute(runnable)
runnable.promise.future
}
}