Merge branch 'master' into wip-rework_dispatcher_config

This commit is contained in:
Viktor Klang 2010-10-25 01:03:53 +02:00
commit 6b7c2fcf46

View file

@ -27,7 +27,7 @@ object Scheduler extends Logging {
case class SchedulerException(msg: String, e: Throwable) extends RuntimeException(msg, e)
private var service = Executors.newSingleThreadScheduledExecutor(SchedulerThreadFactory)
@volatile private var service = Executors.newSingleThreadScheduledExecutor(SchedulerThreadFactory)
log.info("Starting up Scheduler")
@ -108,12 +108,12 @@ object Scheduler extends Logging {
}
}
def shutdown = {
def shutdown: Unit = synchronized {
log.info("Shutting down Scheduler")
service.shutdown
}
def restart = {
def restart: Unit = synchronized {
log.info("Restarting Scheduler")
shutdown
service = Executors.newSingleThreadScheduledExecutor(SchedulerThreadFactory)