From 36c5daec61fef438cb8286a2465f61b871ca3299 Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Thu, 13 Nov 2014 17:33:17 -0800 Subject: [PATCH] KAFKA-1724. Errors after reboot in single node setup. --- core/src/main/scala/kafka/utils/KafkaScheduler.scala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/kafka/utils/KafkaScheduler.scala b/core/src/main/scala/kafka/utils/KafkaScheduler.scala index 9a16343..3a2d0de 100644 --- a/core/src/main/scala/kafka/utils/KafkaScheduler.scala +++ b/core/src/main/scala/kafka/utils/KafkaScheduler.scala @@ -80,13 +80,17 @@ class KafkaScheduler(val threads: Int, }) } } - + override def shutdown() { debug("Shutting down task scheduler.") - ensureStarted - executor.shutdown() - executor.awaitTermination(1, TimeUnit.DAYS) - this.executor = null + if (executor != null) { + executor.shutdown() + executor.awaitTermination(1, TimeUnit.DAYS) + this.executor = null + } else { + warn("Kafka scheduler has not been started") + } + } def schedule(name: String, fun: ()=>Unit, delay: Long, period: Long, unit: TimeUnit) = { -- 1.9.3 (Apple Git-50)