Merge branch 'master' into wip-1728-fjpool-√

This commit is contained in:
Viktor Klang 2012-01-30 16:08:04 +01:00
commit 8bc6513911
67 changed files with 1986 additions and 1768 deletions

View file

@ -155,6 +155,7 @@ object MonitorableThreadFactory {
case class MonitorableThreadFactory(name: String,
daemonic: Boolean,
contextClassLoader: Option[ClassLoader],
exceptionHandler: Thread.UncaughtExceptionHandler = MonitorableThreadFactory.doNothing)
extends ThreadFactory with ForkJoinPool.ForkJoinWorkerThreadFactory {
protected val counter = new AtomicLong
@ -169,6 +170,7 @@ case class MonitorableThreadFactory(name: String,
val t = new Thread(runnable, name + counter.incrementAndGet())
t.setUncaughtExceptionHandler(exceptionHandler)
t.setDaemon(daemonic)
contextClassLoader foreach (t.setContextClassLoader(_))
t
}
}