Merge pull request #2257 from dwhjames/topic/iteratee-ec-prepare

Remove unnecessary execution context preparation from flatMap on iteratees
playframework · Feb 12, 2014 · 9595312 · 9595312
2 parents e10e808 + 19d49a9
commit 9595312
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/framework/src/iteratees/src/main/scala/play/api/libs/iteratee/Iteratee.scala b/framework/src/iteratees/src/main/scala/play/api/libs/iteratee/Iteratee.scala
@@ -491,7 +491,7 @@ trait Iteratee[E, +A] {
   def flatMap[B](f: A => Iteratee[E, B])(implicit ec: ExecutionContext): Iteratee[E, B] = {
     self.pureFlatFoldNoEC { // safe: folder either yields value immediately or executes with another EC
       case Step.Done(a, Input.Empty) => executeIteratee(f(a))(ec /* still on same thread; let executeIteratee do preparation */ )
-      case Step.Done(a, e) => executeIteratee(f(a))(ec.prepare /* still on same thread; let executeIteratee do preparation */ ).pureFlatFold {
+      case Step.Done(a, e) => executeIteratee(f(a))(ec /* still on same thread; let executeIteratee do preparation */ ).pureFlatFold {
         case Step.Done(a, _) => Done(a, e)
         case Step.Cont(k) => k(e)
         case Step.Error(msg, e) => Error(msg, e)