Repository: zeppelin Updated Branches: refs/heads/branch-0.6 4b8b36fdf -> 75a928fc7
[ZEPPELIN-1480] Blocking message pending 10000 for BLOCKING ### What is this PR for? This patch try to address problem described in ZEPPELIN-1480 ### What type of PR is it? Bug Fix ### Todos * [x] - Make websocket send thread safe ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1480 ### How should this be tested? Create multiple paragraphs (for example 10 ```%sh date``` paragraphs) and schedule it every 10sec `0/10 * * * * ?` ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Lee moon soo <[email protected]> Closes #1490 from Leemoonsoo/ZEPPELIN-1480 and squashes the following commits: 0b60743 [Lee moon soo] make websocket send threadsafe (cherry picked from commit 1f6ff6875e7f03b67c016e0ca7280924bf691897) Signed-off-by: Mina Lee <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/75a928fc Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/75a928fc Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/75a928fc Branch: refs/heads/branch-0.6 Commit: 75a928fc7967cca3e2749ffc62de7ccecfe4f6e6 Parents: 4b8b36f Author: Lee moon soo <[email protected]> Authored: Thu Oct 6 08:01:26 2016 +0900 Committer: Mina Lee <[email protected]> Committed: Fri Oct 7 14:47:44 2016 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/socket/NotebookSocket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/75a928fc/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookSocket.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookSocket.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookSocket.java index 5d68bf5..f491ed7 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookSocket.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookSocket.java @@ -65,7 +65,7 @@ public class NotebookSocket extends WebSocketAdapter { return protocol; } - public void send(String serializeMessage) throws IOException { + public synchronized void send(String serializeMessage) throws IOException { connection.getRemote().sendString(serializeMessage); }
