From 1cc2f8b69c5ea7a75ab50ca6a61ea2db5d9ff3c9 Mon Sep 17 00:00:00 2001 From: Benoy Antony Date: Tue, 2 May 2017 15:17:44 -0700 Subject: [PATCH] ZEPPELIN-2484 do a Null check before calling trim on paragraph's text --- .../java/org/apache/zeppelin/socket/NotebookServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 4a0665b75f3..64a4126cc4d 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -1742,10 +1742,10 @@ private void runParagraph(NotebookSocket conn, HashSet userAndRoles, Not } private void addNewParagraphIfLastParagraphIsExecuted(Note note, Paragraph p) { - // if it's the last paragraph and empty, let's add a new one + // if it's the last paragraph and not empty, let's add a new one boolean isTheLastParagraph = note.isLastParagraph(p.getId()); - if (!(p.getText().trim().equals(p.getMagic()) || - Strings.isNullOrEmpty(p.getText())) && + if (!(Strings.isNullOrEmpty(p.getText()) || + p.getText().trim().equals(p.getMagic())) && isTheLastParagraph) { Paragraph newPara = note.addNewParagraph(p.getAuthenticationInfo()); broadcastNewParagraph(note, newPara);