Repository: zeppelin
Updated Branches:
  refs/heads/master 4dd36bfa3 -> 7f6f739ae


HOT FIX: Fix NPE while getting default interpreter setting

### What is this PR for?
NPE while starting Zeppelin for the first time without interpreter settings

### What type of PR is it?
Hot Fix

### What is the Jira issue?
n/a

### How should this be tested?
remove conf/interpreter.json and start Zeppelin

### Logs
**Before**
`
java.lang.NullPointerException
        at 
org.apache.zeppelin.interpreter.InterpreterFactory.getEditorSetting(InterpreterFactory.java:1385)
        at 
org.apache.zeppelin.socket.NotebookServer.getEditorSetting(NotebookServer.java:1796)
        at 
org.apache.zeppelin.socket.NotebookServer.onMessage(NotebookServer.java:290)
        at 
org.apache.zeppelin.socket.NotebookSocket.onWebSocketText(NotebookSocket.java:59)
        at 
org.eclipse.jetty.websocket.common.events.JettyListenerEventDriver.onTextMessage(JettyListenerEventDriver.java:128)
        at 
org.eclipse.jetty.websocket.common.message.SimpleTextMessage.messageComplete(SimpleTextMessage.java:69)
        at 
org.eclipse.jetty.websocket.common.events.AbstractEventDriver.appendMessage(AbstractEventDriver.java:65)
        at 
org.eclipse.jetty.websocket.common.events.JettyListenerEventDriver.onTextFrame(JettyListenerEventDriver.java:122)
        at 
org.eclipse.jetty.websocket.common.events.AbstractEventDriver.incomingFrame(AbstractEventDriver.java:161)
        at 
org.eclipse.jetty.websocket.common.WebSocketSession.incomingFrame(WebSocketSession.java:309)
        at 
org.eclipse.jetty.websocket.common.extensions.ExtensionStack.incomingFrame(ExtensionStack.java:214)
        at 
org.eclipse.jetty.websocket.common.Parser.notifyFrame(Parser.java:220)
        at org.eclipse.jetty.websocket.common.Parser.parse(Parser.java:258)
        at 
org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.readParse(AbstractWebSocketConnection.java:632)
        at 
org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.onFillable(AbstractWebSocketConnection.java:480)
        at 
org.eclipse.jetty.io.AbstractConnection$2.run(AbstractConnection.java:544)
        at 
org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:635)
        at 
org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:555)
        at java.lang.Thread.run(Thread.java:745)
`

**After**
`
 WARN [2016-11-22 18:52:16,890] ({qtp1702660825-60} 
InterpreterFactory.java[getEditorSetting]:1405) - Couldn't get interpreter 
editor setting
`

### Questions:
* Does the licenses files need update? n/a
* Is there breaking changes for older versions? n/a
* Does this needs documentation? n/a

Author: Renjith Kamath <renjith.kam...@gmail.com>

Closes #1669 from r-kamath/npe-interpreter-setting and squashes the following 
commits:

e162689 [Renjith Kamath] Fix NPE while getting default interpreter setting


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

Branch: refs/heads/master
Commit: 7f6f739ae396e07de573bea4ef16a388c54e77b8
Parents: 4dd36bf
Author: Renjith Kamath <renjith.kam...@gmail.com>
Authored: Tue Nov 22 18:57:33 2016 +0530
Committer: Lee moon soo <m...@apache.org>
Committed: Tue Nov 22 12:16:14 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/zeppelin/interpreter/InterpreterFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7f6f739a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
----------------------------------------------------------------------
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
index 1b46ca4..4564e3a 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
@@ -1382,9 +1382,9 @@ public class InterpreterFactory implements 
InterpreterGroupFactory {
   public Map<String, Object> getEditorSetting(String user, String noteId, 
String replName) {
     Interpreter intp = getInterpreter(user, noteId, replName);
     Map<String, Object> editor = DEFAULT_EDITOR;
-    String defaultSettingName = getDefaultInterpreterSetting(noteId).getName();
     String group = StringUtils.EMPTY;
     try {
+      String defaultSettingName = 
getDefaultInterpreterSetting(noteId).getName();
       List<InterpreterSetting> intpSettings = getInterpreterSettings(noteId);
       for (InterpreterSetting intpSetting : intpSettings) {
         String[] replNameSplit = replName.split("\\.");

Reply via email to