diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-03-13 16:32:03 +0100 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-04-19 13:09:03 +0200 |
| commit | 63deb6203a9f884a923d8b1b2c88f5b867b4be59 (patch) | |
| tree | df029304d55ffc87a06f019a0b41d263ee883727 | |
| parent | 58961c7455ede33fbf86f25ac6cd2a7c0a413ea2 (diff) | |
| download | scala-63deb6203a9f884a923d8b1b2c88f5b867b4be59.tar.gz scala-63deb6203a9f884a923d8b1b2c88f5b867b4be59.tar.bz2 scala-63deb6203a9f884a923d8b1b2c88f5b867b4be59.zip | |
[backport] SI-7237 Always choose ForkJoinTaskSupport
... on Java 6 and above.
ForkJoinTaskSupport works on Hotspot, Avian and J9,
while ThreadPoolTaskSupport causes the test
test/files/scalacheck/parallel-collections
to reliably hang on all three.
We keep ThreadPoolTaskSupport around to keep the hope
alive that we still have a glimpse of 1.5 support.
| -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 |