summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2009-12-22 18:15:43 +0000
committerPhilipp Haller <hallerp@gmail.com>2009-12-22 18:15:43 +0000
commitd32b5bc758e9203ed66b2517d2abc2530385c1dc (patch)
tree68c5d0d9f80ce238385641410a3c11ba7af96f9a /src
parent14fcdff9c7da9f2be7613e039819dfb6451a4fc3 (diff)
downloadscala-d32b5bc758e9203ed66b2517d2abc2530385c1dc.tar.gz
scala-d32b5bc758e9203ed66b2517d2abc2530385c1dc.tar.bz2
scala-d32b5bc758e9203ed66b2517d2abc2530385c1dc.zip
Closes #2538. no review necessary.
Diffstat (limited to 'src')
-rw-r--r--src/actors/scala/actors/scheduler/ThreadPoolConfig.scala10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
index 5ffbc80421..93112ae80a 100644
--- a/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
+++ b/src/actors/scala/actors/scheduler/ThreadPoolConfig.scala
@@ -36,10 +36,12 @@ object ThreadPoolConfig {
}
}
- val maxPoolSize = getIntegerProp("actors.maxPoolSize") match {
- case Some(i) if (i >= corePoolSize) => i
- case Some(i) if (i < corePoolSize) => corePoolSize
- case _ => 256
+ val maxPoolSize = {
+ val preMaxSize = getIntegerProp("actors.maxPoolSize") match {
+ case Some(i) => i
+ case _ => 256
+ }
+ if (preMaxSize >= corePoolSize) preMaxSize else corePoolSize
}
private[actors] def useForkJoin: Boolean =