From 9e1380d8de59b6a5c23a4fc08dca90f5d850bd06 Mon Sep 17 00:00:00 2001 From: jqin Date: Thu, 22 Jan 2015 15:14:21 -0800 Subject: [PATCH 1/2] patch for KAFKA-1890 --- core/src/main/scala/kafka/tools/MirrorMaker.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/kafka/tools/MirrorMaker.scala b/core/src/main/scala/kafka/tools/MirrorMaker.scala index 5cbc810..087c088 100644 --- a/core/src/main/scala/kafka/tools/MirrorMaker.scala +++ b/core/src/main/scala/kafka/tools/MirrorMaker.scala @@ -213,11 +213,11 @@ object MirrorMaker extends Logging with KafkaMetricsGroup { val customRebalanceListenerClass = options.valueOf(consumerRebalanceListenerOpt) val customRebalanceListener = { if (customRebalanceListenerClass != null) - Utils.createObject[ConsumerRebalanceListener](customRebalanceListenerClass) + Some(Utils.createObject[ConsumerRebalanceListener](customRebalanceListenerClass)) else - null + Nonegi } - consumerRebalanceListener = new InternalRebalanceListener(mirrorDataChannel, Some(customRebalanceListener)) + consumerRebalanceListener = new InternalRebalanceListener(mirrorDataChannel, customRebalanceListener) connector.setConsumerRebalanceListener(consumerRebalanceListener) // create producer threads -- 1.8.3.4 (Apple Git-47) From 99426c24889f03c1d42d859e484b3f5266864f6f Mon Sep 17 00:00:00 2001 From: jqin Date: Thu, 22 Jan 2015 15:24:53 -0800 Subject: [PATCH 2/2] Patch for KAFKA-1890 --- core/src/main/scala/kafka/tools/MirrorMaker.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/kafka/tools/MirrorMaker.scala b/core/src/main/scala/kafka/tools/MirrorMaker.scala index 087c088..8dd8944 100644 --- a/core/src/main/scala/kafka/tools/MirrorMaker.scala +++ b/core/src/main/scala/kafka/tools/MirrorMaker.scala @@ -215,7 +215,7 @@ object MirrorMaker extends Logging with KafkaMetricsGroup { if (customRebalanceListenerClass != null) Some(Utils.createObject[ConsumerRebalanceListener](customRebalanceListenerClass)) else - Nonegi + None } consumerRebalanceListener = new InternalRebalanceListener(mirrorDataChannel, customRebalanceListener) connector.setConsumerRebalanceListener(consumerRebalanceListener) -- 1.8.3.4 (Apple Git-47)