diff options
| author | Paul Phillips <paulp@improving.org> | 2010-02-26 17:03:22 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-02-26 17:03:22 +0000 |
| commit | 2b1513b35e3172a9045946f2621167a7310a1855 (patch) | |
| tree | e23e7dd6b975bd84ac4359d1a4557fc090a53dbc /src/actors | |
| parent | cda9718a21ca02d7d13efe7b07f4d4e0c5697171 (diff) | |
| download | scala-2b1513b35e3172a9045946f2621167a7310a1855.tar.gz scala-2b1513b35e3172a9045946f2621167a7310a1855.tar.bz2 scala-2b1513b35e3172a9045946f2621167a7310a1855.zip | |
Undid my awful code which had broken the thread...
Undid my awful code which had broken the thread scheduler selection.
Further unbroke it beyond that unbreaking hopefully to the point where
java 1.6 on OSX is recognized as such. Review by haller.
Diffstat (limited to 'src/actors')
| -rw-r--r-- | src/actors/scala/actors/scheduler/ThreadPoolConfig.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala index c96dd6d8d3..a1bf35e0e1 100644 --- a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala +++ b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala @@ -44,7 +44,8 @@ object ThreadPoolConfig { Debug.info(this+": java.vm.vendor = "+javaVmVendor) // on IBM J9 1.6 do not use ForkJoinPool - isJavaAtLeast(1.6) && (javaVmVendor contains "Sun") + // XXX this all needs to go into Properties. + isJavaAtLeast("1.6") && ((javaVmVendor contains "Sun") || (javaVmVendor contains "Apple")) } catch { case _: SecurityException => false |