diff options
| author | James Iry <jamesiry@gmail.com> | 2013-05-28 08:57:45 -0700 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-05-28 08:57:45 -0700 |
| commit | 9eb63c522fc3f490ff8ff3e731dca1e160a0338f (patch) | |
| tree | 21ba853da1da012258a1c4bd9394b95c105e9b06 | |
| parent | 9b310bc906257724fb0772cee116e4a7ebdb0acb (diff) | |
| parent | f92ef919e9cd69704c0682b83768dbba697f1fe3 (diff) | |
| download | scala-9eb63c522fc3f490ff8ff3e731dca1e160a0338f.tar.gz scala-9eb63c522fc3f490ff8ff3e731dca1e160a0338f.tar.bz2 scala-9eb63c522fc3f490ff8ff3e731dca1e160a0338f.zip | |
Merge pull request #2570 from soc/SI-7391
SI-7391 Always use ForkJoin in Scala actors on ...
| -rw-r--r-- | src/actors/scala/actors/scheduler/ThreadPoolConfig.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala index ee8776f397..bfd4e7ac40 100644 --- a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala +++ b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala @@ -42,10 +42,7 @@ private[actors] object ThreadPoolConfig { (propIsSetTo("actors.enableForkJoin", "true") || { Debug.info(this+": java.version = "+javaVersion) Debug.info(this+": java.vm.vendor = "+javaVmVendor) - - // on IBM J9 1.6 do not use ForkJoinPool - // XXX this all needs to go into Properties. - isJavaAtLeast("1.6") && ((javaVmVendor contains "Oracle") || (javaVmVendor contains "Sun") || (javaVmVendor contains "Apple")) + isJavaAtLeast("1.6") }) catch { case _: SecurityException => false |