Skip to content

Commit f92ef91

Browse files
committed
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.
1 parent f81a4f9 commit f92ef91

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/actors/scala/actors/scheduler/ThreadPoolConfig.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ private[actors] object ThreadPoolConfig {
4242
(propIsSetTo("actors.enableForkJoin", "true") || {
4343
Debug.info(this+": java.version = "+javaVersion)
4444
Debug.info(this+": java.vm.vendor = "+javaVmVendor)
45-
46-
// on IBM J9 1.6 do not use ForkJoinPool
47-
// XXX this all needs to go into Properties.
48-
isJavaAtLeast("1.6") && ((javaVmVendor contains "Oracle") || (javaVmVendor contains "Sun") || (javaVmVendor contains "Apple"))
45+
isJavaAtLeast("1.6")
4946
})
5047
catch {
5148
case _: SecurityException => false

0 commit comments

Comments
 (0)