Skip to content

[HOTFIX] Fix NullPointerException at org.apache.zeppelin.notebook.Paragraph.getRepl(Paragraph.java:204) #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Leemoonsoo wants to merge 3 commits into from
Closed

[HOTFIX] Fix NullPointerException at org.apache.zeppelin.notebook.Paragraph.getRepl(Paragraph.java:204) #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e8697b
Set interpreter factory into paragraph right after loaded
Leemoonsoo Jul 7, 2016
0471042
Add unittest
Leemoonsoo Jul 8, 2016
10746f5
adjust indentation
Leemoonsoo Jul 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ public void setName(String name) {

public void setInterpreterFactory(InterpreterFactory factory) {
this.factory = factory;
synchronized (paragraphs) {
for (Paragraph p : paragraphs) {
p.setInterpreterFactory(factory);
}
}
}

public JobListenerFactory getJobListenerFactory() {
Expand Down Expand Up @@ -447,7 +452,6 @@ public void runAll() {
authenticationInfo.setUser(cronExecutingUser);
p.setAuthenticationInfo(authenticationInfo);

p.setInterpreterFactory(factory);
p.setListener(jobListenerFactory.getParagraphJobListener(this));
Interpreter intp = factory.getInterpreter(getId(), p.getRequiredReplName());

Expand All @@ -463,7 +467,6 @@ public void runAll() {
*/
public void run(String paragraphId) {
Paragraph p = getParagraph(paragraphId);
p.setInterpreterFactory(factory);
p.setListener(jobListenerFactory.getParagraphJobListener(this));
String requiredReplName = p.getRequiredReplName();
Interpreter intp = factory.getInterpreter(getId(), requiredReplName);
Expand Down Expand Up @@ -501,7 +504,6 @@ public boolean isTerminated() {

public List<InterpreterCompletion> completion(String paragraphId, String buffer, int cursor) {
Paragraph p = getParagraph(paragraphId);
p.setInterpreterFactory(factory);
p.setListener(jobListenerFactory.getParagraphJobListener(this));
List completion = p.completion(buffer, cursor);

Expand Down
16 changes: 16 additions & 0 deletions zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,22 @@ public void testSelectingReplImplementation() throws IOException {
assertEquals("repl2: hello world", p2.getResult().message());
}

@Test
public void testReloadAndSetInterpreter() throws IOException {
// given a notebook
File srcDir = new File("src/test/resources/2A94M5J1Z");
File destDir = new File(notebookDir.getAbsolutePath() + "/2A94M5J1Z");
FileUtils.copyDirectory(srcDir, destDir);

// when load
notebook.reloadAllNotes(null);
assertEquals(1, notebook.getAllNotes().size());

// then interpreter factory should be injected into all the paragraphs
Note note = notebook.getAllNotes().get(0);
assertNull(note.getParagraphs().get(0).getRepl(null));
}

@Test
public void testReloadAllNotes() throws IOException {
File srcDir = new File("src/test/resources/2A94M5J1Z");
Expand Down