[kylin] branch master updated: KYLIN-3932 KafkaConfigOverride to take effect

[nic]

This is an automated email from the ASF dual-hosted git repository.

nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new cb96418  KYLIN-3932 KafkaConfigOverride to take effect
cb96418 is described below

commit cb9641875b8b9783f06f5c1169231d36d75ae76f
Author: javalife0312 <javalife0...@126.com>
AuthorDate: Fri Apr 12 15:09:11 2019 +0800

    KYLIN-3932 KafkaConfigOverride to take effect
---
 .../java/org/apache/kylin/stream/source/kafka/KafkaSource.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/stream-source-kafka/src/main/java/org/apache/kylin/stream/source/kafka/KafkaSource.java
 
b/stream-source-kafka/src/main/java/org/apache/kylin/stream/source/kafka/KafkaSource.java
index 1f61f43..6e46c68 100644
--- 
a/stream-source-kafka/src/main/java/org/apache/kylin/stream/source/kafka/KafkaSource.java
+++ 
b/stream-source-kafka/src/main/java/org/apache/kylin/stream/source/kafka/KafkaSource.java
@@ -245,7 +245,12 @@ public class KafkaSource implements IStreamingSource {
     }
 
     public static Map<String, Object> getKafkaConf(Map<String, String> 
sourceProperties, KylinConfig kylinConfig) {
-        return getKafkaConf(sourceProperties);
+        Map<String, String> kafkaConfigOverride = 
kylinConfig.getKafkaConfigOverride();
+        Map<String, Object> kafkaConf = getKafkaConf(sourceProperties);
+        kafkaConf.putAll(kafkaConfigOverride);
+
+        return kafkaConf;
+        //return getKafkaConf(sourceProperties);
     }
 
     public static Map<String, Object> getKafkaConf(Map<String, String> 
sourceProperties) {