diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-11-11 16:59:45 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-11-11 16:59:45 +0000 |
| commit | 1016522ec924794d3966b756c5b8b78af6acc1b9 (patch) | |
| tree | 961f1c7f3232f083106dd41d7958e6fa3da4e838 /src/library | |
| parent | f308e5d703c04dca9d7e655c7ca04f031c56b379 (diff) | |
| download | scala-1016522ec924794d3966b756c5b8b78af6acc1b9.tar.gz scala-1016522ec924794d3966b756c5b8b78af6acc1b9.tar.bz2 scala-1016522ec924794d3966b756c5b8b78af6acc1b9.zip | |
Changes the fork join pool detection for JVM1.7...
Changes the fork join pool detection for JVM1.7, for actors and parallel
collections libraries.
Review by phaller.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/parallel/package.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala index 36dfff4c4c..addc366072 100644 --- a/src/library/scala/collection/parallel/package.scala +++ b/src/library/scala/collection/parallel/package.scala @@ -42,7 +42,7 @@ package object parallel { private[parallel] def getTaskSupport: TaskSupport = if (util.Properties.isJavaAtLeast("1.6")) { val vendor = util.Properties.javaVmVendor - if ((vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport + if ((vendor contains "Oracle") || (vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport else new ThreadPoolTaskSupport } else new ThreadPoolTaskSupport |