diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-02 04:26:07 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-02 04:26:07 -0700 |
| commit | fcd604a44c9bdf377cf8574cf4f0d16bd17eac96 (patch) | |
| tree | df029304d55ffc87a06f019a0b41d263ee883727 | |
| parent | 58961c7455ede33fbf86f25ac6cd2a7c0a413ea2 (diff) | |
| parent | 63deb6203a9f884a923d8b1b2c88f5b867b4be59 (diff) | |
| download | scala-fcd604a44c9bdf377cf8574cf4f0d16bd17eac96.tar.gz scala-fcd604a44c9bdf377cf8574cf4f0d16bd17eac96.tar.bz2 scala-fcd604a44c9bdf377cf8574cf4f0d16bd17eac96.zip | |
Merge pull request #2412 from soc/SI-7237-2.9
[backport] SI-7237 Always choose ForkJoinTaskSupport
| -rw-r--r-- | src/library/scala/collection/parallel/package.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala index ec2b583690..36cf45f87a 100644 --- a/src/library/scala/collection/parallel/package.scala +++ b/src/library/scala/collection/parallel/package.scala @@ -46,11 +46,8 @@ package object parallel { private[parallel] def outofbounds(idx: Int) = throw new IndexOutOfBoundsException(idx.toString) private[parallel] def getTaskSupport: TaskSupport = - if (util.Properties.isJavaAtLeast("1.6")) { - val vendor = util.Properties.javaVmVendor - if ((vendor contains "Oracle") || (vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport - else new ThreadPoolTaskSupport - } else new ThreadPoolTaskSupport + if (scala.util.Properties.isJavaAtLeast("1.6")) new ForkJoinTaskSupport + else new ThreadPoolTaskSupport val tasksupport = getTaskSupport |