diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-21 19:13:19 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-21 19:13:19 +0000 |
| commit | c9ae821b7702169147fe324eb160710623c16280 (patch) | |
| tree | c93e98f9b26161339b148b2d81d21cc02c3af370 | |
| parent | c2c54e12d41951ad74b927f6332e5e766ed19dc9 (diff) | |
| download | scala-c9ae821b7702169147fe324eb160710623c16280.tar.gz scala-c9ae821b7702169147fe324eb160710623c16280.tar.bz2 scala-c9ae821b7702169147fe324eb160710623c16280.zip | |
Disabled forkjoin on ibm1.6.
| -rw-r--r-- | src/library/scala/collection/parallel/package.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala index cf342b0203..1e545fd882 100644 --- a/src/library/scala/collection/parallel/package.scala +++ b/src/library/scala/collection/parallel/package.scala @@ -37,8 +37,11 @@ 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")) new ForkJoinTaskSupport - else new ThreadPoolTaskSupport + if (util.Properties.isJavaAtLeast("1.6")) { + val vendor = util.Properties.javaVmVendor + if ((vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport + else new ThreadPoolTaskSupport + } else new ThreadPoolTaskSupport val tasksupport = getTaskSupport |