You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/08/08 17:35:34 UTC
zeppelin git commit: ZEPPELIN-1305. Fix bug of ZEPPELIN-1215
Repository: zeppelin
Updated Branches:
refs/heads/master f71d09ca1 -> 80735bc0d
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 <zj...@apache.org>
Closes #1300 from zjffdu/ZEPPELIN-1305 and squashes the following commits:
9206320 [Jeff Zhang] ZEPPELIN-1305. Fix bug of ZEPPELIN-1215
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/80735bc0
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/80735bc0
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/80735bc0
Branch: refs/heads/master
Commit: 80735bc0d58ea69095dedec21e23b6fca3b60d98
Parents: f71d09c
Author: Jeff Zhang <zj...@apache.org>
Authored: Sun Aug 7 21:41:34 2016 +0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon Aug 8 10:35:25 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/80735bc0/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 f3c45ab..6dc13ad 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -528,8 +528,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");