diff options
author | Viktor Klang <viktor.klang@gmail.com> | 2013-02-19 18:51:24 +0100 |
---|---|---|
committer | Viktor Klang <viktor.klang@gmail.com> | 2013-02-19 19:04:00 +0100 |
commit | bb067d31e4f02cc605146c676031bbfccac639c2 (patch) | |
tree | bf220d2742c37aa27d9b87ed6129bc4b87f5de82 /src | |
parent | 123161b9073eec6dae23b617d85409276849c143 (diff) | |
download | scala-bb067d31e4f02cc605146c676031bbfccac639c2.tar.gz scala-bb067d31e4f02cc605146c676031bbfccac639c2.tar.bz2 scala-bb067d31e4f02cc605146c676031bbfccac639c2.zip |
SI-7146 - Fixing checkinit bug in ExecutionContextImpl and adding test
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/concurrent/impl/ExecutionContextImpl.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala index 43b437dbc6..0aa6b37ffc 100644 --- a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala +++ b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala @@ -19,16 +19,16 @@ import scala.util.control.NonFatal private[scala] class ExecutionContextImpl private[impl] (es: Executor, reporter: Throwable => Unit) extends ExecutionContextExecutor { + // Placed here since the creation of the executor needs to read this val + private[this] val uncaughtExceptionHandler: Thread.UncaughtExceptionHandler = new Thread.UncaughtExceptionHandler { + def uncaughtException(thread: Thread, cause: Throwable): Unit = reporter(cause) + } val executor: Executor = es match { case null => createExecutorService case some => some } - private[this] val uncaughtExceptionHandler: Thread.UncaughtExceptionHandler = new Thread.UncaughtExceptionHandler { - def uncaughtException(thread: Thread, cause: Throwable): Unit = reporter(cause) - } - // Implement BlockContext on FJP threads class DefaultThreadFactory(daemonic: Boolean) extends ThreadFactory with ForkJoinPool.ForkJoinWorkerThreadFactory { def wire[T <: Thread](thread: T): T = { |