diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-04-02 13:22:55 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-04-02 13:22:55 -0700 |
| commit | 29a9c64fda44b5ce715e6bd9b8505b155ce64574 (patch) | |
| tree | 72b85116da989d371a2bd7465d048f8070a082cc /src/library/scala/collection/parallel | |
| parent | 4c85fb324dc3ea0eeebe590e39e8084558834f3a (diff) | |
| download | scala-29a9c64fda44b5ce715e6bd9b8505b155ce64574.tar.gz scala-29a9c64fda44b5ce715e6bd9b8505b155ce64574.tar.bz2 scala-29a9c64fda44b5ce715e6bd9b8505b155ce64574.zip | |
SI-7237 Always choose ForkJoinTaskSupport
ForkJoinTaskSupport works on Hotspot, Avian and J9,
while ThreadPoolTaskSupport causes the test
test/files/scalacheck/parallel-collections
to reliably hang on all three.
Diffstat (limited to 'src/library/scala/collection/parallel')
| -rw-r--r-- | src/library/scala/collection/parallel/package.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala index 85c620239a..66fbad7643 100644 --- a/src/library/scala/collection/parallel/package.scala +++ b/src/library/scala/collection/parallel/package.scala @@ -41,9 +41,7 @@ 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")) new ForkJoinTaskSupport - else new ThreadPoolTaskSupport + private[parallel] def getTaskSupport: TaskSupport = new ForkJoinTaskSupport val defaultTaskSupport: TaskSupport = getTaskSupport |