You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2016/10/07 05:47:36 UTC
zeppelin git commit: [ZEPPELIN-1480] Blocking message pending 10000
for BLOCKING
Repository: zeppelin
Updated Branches:
refs/heads/master 544aa3b66 -> 1f6ff6875
[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 <mo...@apache.org>
Closes #1490 from Leemoonsoo/ZEPPELIN-1480 and squashes the following commits:
0b60743 [Lee moon soo] make websocket send threadsafe
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1f6ff687
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1f6ff687
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1f6ff687
Branch: refs/heads/master
Commit: 1f6ff6875e7f03b67c016e0ca7280924bf691897
Parents: 544aa3b
Author: Lee moon soo <mo...@apache.org>
Authored: Thu Oct 6 08:01:26 2016 +0900
Committer: Mina Lee <mi...@apache.org>
Committed: Fri Oct 7 14:47:30 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/1f6ff687/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);
}