diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-03 02:06:59 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-03 02:06:59 -0700 |
| commit | 0f5b1e8b3f21c2741c67299313d8705b3f824ed3 (patch) | |
| tree | 0d47d1fb6c2bda9a928acb2e7b84edc2c4f39172 | |
| parent | fcd604a44c9bdf377cf8574cf4f0d16bd17eac96 (diff) | |
| parent | 2b4b2b8fed25e2b6d81cbe44423360fad0279d8a (diff) | |
| download | scala-0f5b1e8b3f21c2741c67299313d8705b3f824ed3.tar.gz scala-0f5b1e8b3f21c2741c67299313d8705b3f824ed3.tar.bz2 scala-0f5b1e8b3f21c2741c67299313d8705b3f824ed3.zip | |
Merge pull request #2413 from soc/SI-7391-2.9
[backport] SI-7391 Always use ForkJoin in Scala actors
| -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 a7bf8ec2ba..ff16139377 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 |