diff options
| author | Philipp Haller <hallerp@gmail.com> | 2009-12-01 15:40:23 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2009-12-01 15:40:23 +0000 |
| commit | a55310838b97a1e55d6804e93e5080d8187994b1 (patch) | |
| tree | c128cf207b1a5627c82c4152bf221899be2cf880 /src | |
| parent | 0f17201b1005b85a8bbfd6be668fd9ffcc782375 (diff) | |
| download | scala-a55310838b97a1e55d6804e93e5080d8187994b1.tar.gz scala-a55310838b97a1e55d6804e93e5080d8187994b1.tar.bz2 scala-a55310838b97a1e55d6804e93e5080d8187994b1.zip | |
Added switch to not use fork-join pool on a 1.5...
Added switch to not use fork-join pool on a 1.5 JVM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/actors/scala/actors/Scheduler.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index 080abbbf41..e4c3f76d28 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -25,9 +25,10 @@ object Scheduler extends DelegatingScheduler { def makeNewScheduler: IScheduler = { // test on which JVM we are running - val jvmVendor = System.getProperty("java.vm.vendor") - val sched = if (jvmVendor.indexOf("IBM") != -1) { - Debug.info(this+": running on a "+jvmVendor+" JVM") + val jvmVersion = System.getProperty("java.version") + val jvmVendor = System.getProperty("java.vm.vendor") + val sched = if (jvmVersion.indexOf("1.5") != -1 || + jvmVendor.indexOf("IBM") != -1) { // on IBM J9 1.6 do not use ForkJoinPool val s = new ResizableThreadPoolScheduler(false) s.start() |