From de030cd378240be20fb649968d24d047a7cae0e4 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 28 Aug 2018 15:57:05 +0200 Subject: [PATCH] Updating the logic which locates EC FJP to 2.13 --- .../main/scala/scala/collection/parallel/Tasks.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/scala/collection/parallel/Tasks.scala b/core/src/main/scala/scala/collection/parallel/Tasks.scala index d59e58eb..d3063f99 100644 --- a/core/src/main/scala/scala/collection/parallel/Tasks.scala +++ b/core/src/main/scala/scala/collection/parallel/Tasks.scala @@ -391,10 +391,12 @@ trait ExecutionContextTasks extends Tasks { * Otherwise, the driver will be a Scala `Future`-based implementation. */ private val driver: Tasks = executionContext match { - case eci: scala.concurrent.impl.ExecutionContextImpl => eci.executor match { - case fjp: ForkJoinPool => new ForkJoinTaskSupport(fjp) - case _ => new FutureTasks(environment) - } + case fjp: ForkJoinPool => new ForkJoinTaskSupport(fjp) + case eci: scala.concurrent.impl.ExecutionContextImpl => + eci.executor match { + case fjp: ForkJoinPool => new ForkJoinTaskSupport(fjp) + case _ => new FutureTasks(environment) + } case _ => new FutureTasks(environment) }