diff options
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() |