You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/08/20 06:58:04 UTC
zeppelin git commit: [ZEPPELIN-3726] Fix NPE for resourceList
function "getAllResourcesExcept".
Repository: zeppelin
Updated Branches:
refs/heads/master 041c8d377 -> 6854bdd7d
[ZEPPELIN-3726] Fix NPE for resourceList function "getAllResourcesExcept".
### What is this PR for?
Trivial fix for exclude NPE in org.apache.zeppelin.interpreter.InterpreterSettingManager#getAllResourcesExcept
### What type of PR is it?
Bug Fix
### What is the Jira issue?
[[ZEPPELIN-3726]](https://issues.apache.org/jira/browse/ZEPPELIN-3726)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Maxim Belousov <me...@ya.ru>
Closes #3147 from mebelousov/DW-17923 and squashes the following commits:
fa1b799c8 [Maxim Belousov] Merge branch 'master' of https://github.com/apache/zeppelin
60a6d040a [Maxim Belousov] Fix possible NPE for resourceList function "getAllResourcesExcept".
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/6854bdd7
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/6854bdd7
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/6854bdd7
Branch: refs/heads/master
Commit: 6854bdd7d31d5b0c4edd7a5b8dfc4c99dc26f3dc
Parents: 041c8d3
Author: Maxim Belousov <me...@ya.ru>
Authored: Thu Aug 16 11:28:00 2018 +0300
Committer: Jeff Zhang <zj...@apache.org>
Committed: Mon Aug 20 14:57:59 2018 +0800
----------------------------------------------------------------------
.../apache/zeppelin/interpreter/InterpreterSettingManager.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6854bdd7/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
index a12d67b..d730db4 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
@@ -518,8 +518,10 @@ public class InterpreterSettingManager implements InterpreterSettingManagerMBean
return client.resourcePoolGetAll();
}
});
- for (String res : resourceList) {
- resourceSet.add(Resource.fromJson(res));
+ if (resourceList != null) {
+ for (String res : resourceList) {
+ resourceSet.add(Resource.fromJson(res));
+ }
}
}
}