Fix NPE when %sql is called before %spark
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/124d3342 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/124d3342 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/124d3342 Branch: refs/heads/master Commit: 124d3342a1f24ca89b3759985e83cc3ee73b2a56 Parents: 1012fb4 Author: Lee moon soo <[email protected]> Authored: Mon Mar 16 16:07:41 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Mon Mar 16 16:07:41 2015 +0900 ---------------------------------------------------------------------- .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/124d3342/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 8ab13a4..4b7dd7d 100644 --- a/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -25,6 +25,7 @@ import com.nflabs.zeppelin.interpreter.InterpreterContext; import com.nflabs.zeppelin.interpreter.InterpreterException; import com.nflabs.zeppelin.interpreter.InterpreterGroup; import com.nflabs.zeppelin.interpreter.InterpreterResult; +import com.nflabs.zeppelin.interpreter.LazyOpenInterpreter; import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterContext; import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterResult; import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService; @@ -112,7 +113,7 @@ public class RemoteInterpreterServer repl.setClassloaderUrls(new URL[]{}); synchronized (interpreterGroup) { - interpreterGroup.add(new ClassloaderInterpreter(repl, cl)); + interpreterGroup.add(new LazyOpenInterpreter((new ClassloaderInterpreter(repl, cl)))); } logger.info("Instantiate interpreter {}", className);
