spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject spark git commit: [SPARK-8865] [STREAMING] FIX BUG: check key in kafka params
Date Thu, 09 Jul 2015 22:02:40 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.4 990f434e6 -> 2f2f9da4b


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

Author: guowei2 <guowei@growingio.com>

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

48ca17a [guowei2] fix contains key

(cherry picked from commit 897700369f3aedf1a8fdb0984dd3d6d8e498e3af)
Signed-off-by: Tathagata Das <tathagata.das1565@gmail.com>


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

Branch: refs/heads/branch-1.4
Commit: 2f2f9da4b71ec9aeb67044cf0065ce951a3ac985
Parents: 990f434
Author: guowei2 <guowei@growingio.com>
Authored: Thu Jul 9 15:01:53 2015 -0700
Committer: Tathagata Das <tathagata.das1565@gmail.com>
Committed: Thu Jul 9 15:02:32 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/2f2f9da4/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 65d51d8..c88b5db 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
@@ -402,7 +402,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


Mime
View raw message