From 3a146d3e0022f70576f34634910f3bd39c911ac3 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Fri, 3 Feb 2017 09:01:09 +0800 Subject: [PATCH] ZEPPELIN-2045. Pass interpreter properties with "spark." as prefix to SparkConf --- .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java index 0584a302c55..1aecec42f0e 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -332,7 +332,7 @@ public Object createSparkSession() { for (Object k : intpProperty.keySet()) { String key = (String) k; String val = toString(intpProperty.get(key)); - if (!key.startsWith("spark.") || !val.trim().isEmpty()) { + if (key.startsWith("spark.") && !val.trim().isEmpty()) { logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val)); conf.set(key, val); } @@ -463,7 +463,7 @@ public SparkContext createSparkContext_1() { for (Object k : intpProperty.keySet()) { String key = (String) k; String val = toString(intpProperty.get(key)); - if (!key.startsWith("spark.") || !val.trim().isEmpty()) { + if (key.startsWith("spark.") && !val.trim().isEmpty()) { logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val)); conf.set(key, val); }