#682 backported stackoverflow FutureEffect fixfor 4.1.x

etorreborre · Jul 6, 2018 · 48fa3ce · 48fa3ce
1 parent 0623b12
commit 48fa3ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/shared/src/main/scala/org/specs2/control/eff/FutureEffect.scala b/common/shared/src/main/scala/org/specs2/control/eff/FutureEffect.scala
@@ -42,8 +42,8 @@ object TimedFuture {
 
     def ap[A, B](fa: =>TimedFuture[A])(ff: =>TimedFuture[(A) => B]): TimedFuture[B] = {
       val newCallback = { es: ExecutorServices =>
-        val ffRan = ff.runNow(es)
-        val faRan = fa.runNow(es)
+        val ffRan = Future(ff.runNow(es))(es.executionContext).flatMap(identity)(es.executionContext)
+        val faRan = Future(fa.runNow(es))(es.executionContext).flatMap(identity)(es.executionContext)
         faRan.flatMap(a => ffRan.map(f => f(a))(es.executionContext))(es.executionContext)
       }
       TimedFuture(newCallback)

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "4.1.0"
+version in ThisBuild := "4.1.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "4.1.0"
		version in ThisBuild := "4.1.1"