From c9ae821b7702169147fe324eb160710623c16280 Mon Sep 17 00:00:00 2001 From: Aleksandar Pokopec Date: Tue, 21 Dec 2010 19:13:19 +0000 Subject: Disabled forkjoin on ibm1.6. --- src/library/scala/collection/parallel/package.scala | 7 +++++-- 1 file 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 -- cgit v1.2.3