Repository: zeppelin Updated Branches: refs/heads/branch-0.6 1a138b5b6 -> a6d501a91
ZEPPELIN-1305. Fix bug of ZEPPELIN-1215 ### What is this PR for? It is my bad, Before commit ZEPPELIN-1215, I change `getProperty().getProperty(key) != null` to `getProperty().contains(key)`. But it should be `getProperty().containsKey(key)`. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1305 ### How should this be tested? Tested manually in a secured cluster ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <[email protected]> Closes #1300 from zjffdu/ZEPPELIN-1305 and squashes the following commits: 9206320 [Jeff Zhang] ZEPPELIN-1305. Fix bug of ZEPPELIN-1215 (cherry picked from commit 80735bc0d58ea69095dedec21e23b6fca3b60d98) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a6d501a9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a6d501a9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a6d501a9 Branch: refs/heads/branch-0.6 Commit: a6d501a915ed5cc89c3a835ec4b02111bc2cf14a Parents: 1a138b5 Author: Jeff Zhang <[email protected]> Authored: Sun Aug 7 21:41:34 2016 +0800 Committer: Lee moon soo <[email protected]> Committed: Mon Aug 8 10:35:40 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a6d501a9/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 aa7e3a2..8aec939 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -526,8 +526,8 @@ public class SparkInterpreter extends Interpreter { if (getProperty("master").equals("yarn-client")) { System.setProperty("SPARK_YARN_MODE", "true"); } - if (getProperty().contains("spark.yarn.keytab") && - getProperty().contains("spark.yarn.principal")) { + if (getProperty().containsKey("spark.yarn.keytab") && + getProperty().containsKey("spark.yarn.principal")) { try { String keytab = getProperty().getProperty("spark.yarn.keytab"); String principal = getProperty().getProperty("spark.yarn.principal");
