Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branches 'retronym/backport/4895', 'retronym/ba…

…ckport/fork-join-detection-jdk-1.7' and 'matthewfarwell/si-4771-scala-eats-exit-code' into develop-2.9.x
  • Loading branch information...
commit 70b27bc6a60e6b4502e3eb14cbc0ad1040220226 3 parents 0e49b37 + 9eb9682 + 6f43d81
@paulp paulp authored
View
2  src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
@@ -45,7 +45,7 @@ private[actors] object ThreadPoolConfig {
// on IBM J9 1.6 do not use ForkJoinPool
// XXX this all needs to go into Properties.
- isJavaAtLeast("1.6") && ((javaVmVendor contains "Sun") || (javaVmVendor contains "Apple"))
+ isJavaAtLeast("1.6") && ((javaVmVendor contains "Oracle") || (javaVmVendor contains "Sun") || (javaVmVendor contains "Apple"))
})
catch {
case _: SecurityException => false
View
2  src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -25,8 +25,8 @@ function restoreSttySettings() {
function onExit() {
if [[ "$saved_stty" != "" ]]; then
restoreSttySettings
- exit $scala_exit_status
fi
+ exit $scala_exit_status
}
# to reenable echo if we are interrupted before completing.
View
2  src/library/scala/collection/parallel/package.scala
@@ -48,7 +48,7 @@ package object parallel {
private[parallel] def getTaskSupport: TaskSupport =
if (util.Properties.isJavaAtLeast("1.6")) {
val vendor = util.Properties.javaVmVendor
- if ((vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport
+ if ((vendor contains "Oracle") || (vendor contains "Sun") || (vendor contains "Apple")) new ForkJoinTaskSupport
else new ThreadPoolTaskSupport
} else new ThreadPoolTaskSupport
Please sign in to comment.
Something went wrong with that request. Please try again.