From 58ae9837a8d2d5d8feebe0c5be6ea1a75bcc21df Mon Sep 17 00:00:00 2001 From: 1ambda <1amb4a@gmail.com> Date: Wed, 4 Jan 2017 16:51:23 +0900 Subject: [PATCH] fix: DON'T create new para when run all paragraphs --- .../java/org/apache/zeppelin/socket/NotebookServer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 3e56b0529ec..b3bd0a34ed2 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 @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; +import com.google.common.base.Strings; import com.google.common.collect.Sets; import org.apache.commons.lang.StringUtils; import org.apache.commons.vfs2.FileSystemException; @@ -1562,9 +1563,11 @@ private void runParagraph(NotebookSocket conn, HashSet userAndRoles, Not Map config = (Map) fromMessage.get("config"); p.setConfig(config); - // if it's the last paragraph, let's add a new one + // if it's the last paragraph and empty, let's add a new one boolean isTheLastParagraph = note.isLastParagraph(p.getId()); - if (isTheLastParagraph) { + if (!(text.trim().equals(p.getMagic()) || + Strings.isNullOrEmpty(text)) && + isTheLastParagraph) { Paragraph newPara = note.addParagraph(subject); broadcastNewParagraph(note, newPara); }