Repository: kafka
Updated Branches:
  refs/heads/trunk 45697ed6c -> 602d572f6


kafka-1868; ConsoleConsumer shouldn't override dual.commit.enabled to false if 
not explicitly set; patched by Jun Rao; reviewed by Jeol Koshy


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/602d572f
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/602d572f
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/602d572f

Branch: refs/heads/trunk
Commit: 602d572f6365f80f14e8c968390972ea9767e263
Parents: 45697ed
Author: Jun Rao <jun...@gmail.com>
Authored: Thu Jan 15 17:58:32 2015 -0800
Committer: Jun Rao <jun...@gmail.com>
Committed: Thu Jan 15 17:58:32 2015 -0800

----------------------------------------------------------------------
 core/src/main/scala/kafka/tools/ConsoleConsumer.scala | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/602d572f/core/src/main/scala/kafka/tools/ConsoleConsumer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/tools/ConsoleConsumer.scala 
b/core/src/main/scala/kafka/tools/ConsoleConsumer.scala
index 323fc85..e455cb9 100644
--- a/core/src/main/scala/kafka/tools/ConsoleConsumer.scala
+++ b/core/src/main/scala/kafka/tools/ConsoleConsumer.scala
@@ -126,10 +126,6 @@ object ConsoleConsumer extends Logging {
     }
     consumerProps.put("auto.offset.reset", if(options.has(resetBeginningOpt)) 
"smallest" else "largest")
     consumerProps.put("zookeeper.connect", options.valueOf(zkConnectOpt))
-    if(!consumerProps.containsKey("dual.commit.enabled"))
-      consumerProps.put("dual.commit.enabled","false")
-    if(!consumerProps.containsKey("offsets.storage"))
-      consumerProps.put("offsets.storage","zookeeper")
 
     if (!options.has(deleteConsumerOffsetsOpt) && 
options.has(resetBeginningOpt) &&
        checkZkPathExists(options.valueOf(zkConnectOpt),"/consumers/" + 
consumerProps.getProperty("group.id")+ "/offsets")) {

Reply via email to