Index: core/src/main/scala/kafka/server/KafkaServerStartable.scala =================================================================== --- core/src/main/scala/kafka/server/KafkaServerStartable.scala (revision 1205507) +++ core/src/main/scala/kafka/server/KafkaServerStartable.scala (working copy) @@ -130,6 +130,9 @@ */ threadList.foreach(_.shutdown) + // KAFKA: 212: clear the thread list to remove the older thread references that are already shutdown + threadList = Nil + consumerConnector = Consumer.create(consumerConfig) val topicMessageStreams = consumerConnector.createMessageStreams(topicMap) for ((topic, streamList) <- topicMessageStreams)