Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 8b8edc244 -> 84839c77f


ZEPPELIN-28 propagate empty interpreter vars to Spark conf

Is needed for CouchDB support, see 
https://issues.apache.org/jira/browse/ZEPPELIN-28

Author: Alexander Bezzubov <[email protected]>

Closes #28 from bzz/set-any-spark-conf-parapeters and squashes the following 
commits:

13fccf6 [Alexander Bezzubov] ZEPPELIN-28 propagate empty interpreter vars to 
Spark conf


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/84839c77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/84839c77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/84839c77

Branch: refs/heads/master
Commit: 84839c77f44ee869e952eb489502f7ff425644cc
Parents: 8b8edc2
Author: Alexander Bezzubov <[email protected]>
Authored: Tue Apr 7 16:35:00 2015 +0900
Committer: Lee moon soo <[email protected]>
Committed: Thu Apr 9 01:47:12 2015 +0900

----------------------------------------------------------------------
 .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/84839c77/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
----------------------------------------------------------------------
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 71c5ab5..2461109 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -259,10 +259,8 @@ public class SparkInterpreter extends Interpreter {
     for (Object k : intpProperty.keySet()) {
       String key = (String) k;
       Object value = intpProperty.get(key);
-      if (!isEmptyString(value)) {
-        logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, 
value));
-        conf.set(key, (String) value);
-      }
+      logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, 
value));
+      conf.set(key, (String) value);
     }
 
     SparkContext sparkContext = new SparkContext(conf);

Reply via email to