[zeppelin] branch master updated: [hotfix] NPE in Note#getBindedInterpreterSettings

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 154c43f  [hotfix] NPE in Note#getBindedInterpreterSettings
154c43f is described below

commit 154c43ff4aead7dc6bd252f52f81adb79d79dfe7
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Mon Jun 29 15:04:58 2020 +0800

    [hotfix] NPE in Note#getBindedInterpreterSettings
---
 .../src/main/java/org/apache/zeppelin/notebook/Note.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
index ad353a8..90a2d3a 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
@@ -985,10 +985,12 @@ public class Note implements JsonSerializable {
       settings.add(defaultIntpSetting);
     }
     // add the interpreter setting with the same group of default interpreter group
-    for (InterpreterSetting intpSetting : interpreterSettingManager.get()) {
-      if (intpSetting.getGroup().equals(defaultIntpSetting.getGroup())) {
-        if (intpSetting.isUserAuthorized(userAndRoles)) {
-          settings.add(intpSetting);
+    if (defaultIntpSetting != null) {
+      for (InterpreterSetting intpSetting : interpreterSettingManager.get()) {
+        if (intpSetting.getGroup().equals(defaultIntpSetting.getGroup())) {
+          if (intpSetting.isUserAuthorized(userAndRoles)) {
+            settings.add(intpSetting);
+          }
         }
       }
     }