summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-10-05 07:54:14 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-10-05 07:54:14 +0200
commite04cc7e3aeda80d09196841da669bdc8af8a803d (patch)
tree689870e79860efbf04b201e426a1d7ca911dc3a5
parentdb95f868d9370a64df3b76a035d1731d55db666e (diff)
parentaa6e9d742487eb2ec61c5d548872a4d9d60adb2e (diff)
downloadscala-e04cc7e3aeda80d09196841da669bdc8af8a803d.tar.gz
scala-e04cc7e3aeda80d09196841da669bdc8af8a803d.tar.bz2
scala-e04cc7e3aeda80d09196841da669bdc8af8a803d.zip
Merge pull request #4781 from pauldraper/pauldraper-future-sequence-2.11
Avoid using ExecutionContext for Future.sequence of empty collection
-rw-r--r--src/library/scala/concurrent/Future.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 914646320c..294ca2aa48 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -497,7 +497,7 @@ object Future {
def sequence[A, M[X] <: TraversableOnce[X]](in: M[Future[A]])(implicit cbf: CanBuildFrom[M[Future[A]], A, M[A]], executor: ExecutionContext): Future[M[A]] = {
in.foldLeft(successful(cbf(in))) {
(fr, fa) => for (r <- fr; a <- fa) yield (r += a)
- } map (_.result())
+ }.map(_.result())(InternalCallbackExecutor)
}
/** Returns a new `Future` to the result of the first future in the list that is completed.