You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2015/07/10 00:01:58 UTC

spark git commit: [SPARK-8865] [STREAMING] FIX BUG: check key in kafka params

Repository: spark
Updated Branches:
  refs/heads/master c9e2ef52b -> 897700369


[SPARK-8865] [STREAMING] FIX BUG: check key in kafka params

Author: guowei2 <gu...@growingio.com>

Closes #7254 from guowei2/spark-8865 and squashes the following commits:

48ca17a [guowei2] fix contains key


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

Branch: refs/heads/master
Commit: 897700369f3aedf1a8fdb0984dd3d6d8e498e3af
Parents: c9e2ef5
Author: guowei2 <gu...@growingio.com>
Authored: Thu Jul 9 15:01:53 2015 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Thu Jul 9 15:01:53 2015 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/89770036/external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala
----------------------------------------------------------------------
diff --git a/external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala b/external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala
index 3e6b937..8465432 100644
--- a/external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala
+++ b/external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala
@@ -410,7 +410,7 @@ object KafkaCluster {
       }
 
       Seq("zookeeper.connect", "group.id").foreach { s =>
-        if (!props.contains(s)) {
+        if (!props.containsKey(s)) {
           props.setProperty(s, "")
         }
       }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org