Skip to content

Commit dac20f2

Browse files
authored
Merge pull request #43 from scala/wip-213-EC-forkjoin-√
Updating the logic which locates EC FJP to 2.13
2 parents 3647df7 + de030cd commit dac20f2

File tree

1 file changed

+6
-4
lines changed
  • core/src/main/scala/scala/collection/parallel

1 file changed

+6
-4
lines changed

core/src/main/scala/scala/collection/parallel/Tasks.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,12 @@ trait ExecutionContextTasks extends Tasks {
395395
* Otherwise, the driver will be a Scala `Future`-based implementation.
396396
*/
397397
private val driver: Tasks = executionContext match {
398-
case eci: scala.concurrent.impl.ExecutionContextImpl => eci.executor match {
399-
case fjp: ForkJoinPool => new ForkJoinTaskSupport(fjp)
400-
case _ => new FutureTasks(environment)
401-
}
398+
case fjp: ForkJoinPool => new ForkJoinTaskSupport(fjp)
399+
case eci: scala.concurrent.impl.ExecutionContextImpl =>
400+
eci.executor match {
401+
case fjp: ForkJoinPool => new ForkJoinTaskSupport(fjp)
402+
case _ => new FutureTasks(environment)
403+
}
402404
case _ => new FutureTasks(environment)
403405
}
404406

0 commit comments

Comments
 (0)