diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-04-19 13:22:13 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-05-20 20:51:23 +0200 |
| commit | f92ef919e9cd69704c0682b83768dbba697f1fe3 (patch) | |
| tree | ecef69d92be6e1c955b64cc96e6762038c98d3fd /src/actors/scala | |
| parent | f81a4f92967a2dd69784864e9ab9e1624d7db35b (diff) | |
| download | scala-f92ef919e9cd69704c0682b83768dbba697f1fe3.tar.gz scala-f92ef919e9cd69704c0682b83768dbba697f1fe3.tar.bz2 scala-f92ef919e9cd69704c0682b83768dbba697f1fe3.zip | |
SI-7391 Always use ForkJoin in Scala actors on ...
... Java 6 and above (except when the porperty
actors.enableForkJoin says otherwise)
Like SI-7236 and SI-7237, the logic in
scala.actors.scheduler.ThreadPoolConfig.useForkJoin
(which resulted in a different thread pool implementation
being chosen) was causing random hangs in the test
concurrent-stream.scala when running on Avian.
Diffstat (limited to 'src/actors/scala')
| -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 |