diff options
| author | Paul Phillips <paulp@improving.org> | 2013-03-25 14:27:30 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-03-25 14:27:30 -0700 |
| commit | f0b866e78fc07fe2dd5f38be74d8cba7816867a3 (patch) | |
| tree | bc004aaf07b2dc3966d58ace1792ff8acdb56ad3 | |
| parent | 5e8f4b2596c31eeacec8a30945cbee1841769ad7 (diff) | |
| parent | 67b8de7c3ca3896a8009c881c9395227d38e0250 (diff) | |
| download | scala-f0b866e78fc07fe2dd5f38be74d8cba7816867a3.tar.gz scala-f0b866e78fc07fe2dd5f38be74d8cba7816867a3.tar.bz2 scala-f0b866e78fc07fe2dd5f38be74d8cba7816867a3.zip | |
Merge pull request #2252 from soc/SI-7237-2.10
[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 83aa99ad11..988886b4ea 100644 --- a/src/library/scala/collection/parallel/package.scala +++ b/src/library/scala/collection/parallel/package.scala @@ -42,11 +42,8 @@ package object parallel { private[parallel] def outofbounds(idx: Int) = throw new IndexOutOfBoundsException(idx.toString) private[parallel] def getTaskSupport: TaskSupport = - if (scala.util.Properties.isJavaAtLeast("1.6")) { - val vendor = scala.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 defaultTaskSupport: TaskSupport = getTaskSupport |