You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/11/27 13:09:13 UTC
zeppelin git commit: [ZEPPELIN-3863] fix collaborative mode
Repository: zeppelin
Updated Branches:
refs/heads/master 04b726a0a -> 2ea945f54
[ZEPPELIN-3863] fix collaborative mode
### What is this PR for?
Сollaborative editing mode is not working right now.
This PR fix it
### What type of PR is it?
Bug Fix
### What is the Jira issue?
[ZEPPELIN-3863](https://issues.apache.org/jira/browse/ZEPPELIN-3863),
[ZP-63]
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Savalek <de...@mail.ru>
Closes #3227 from Savalek/ZP-63 and squashes the following commits:
efa3bcb0b [Savalek] [ZEPPELIN-3863][ZP-63] fix collaborative mode
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2ea945f5
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2ea945f5
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2ea945f5
Branch: refs/heads/master
Commit: 2ea945f548a4e41312026d5ee1070714c155a11e
Parents: 04b726a
Author: Savalek <de...@mail.ru>
Authored: Thu Nov 15 12:46:12 2018 +0300
Committer: jeffzhang.zjf <je...@alibaba-inc.com>
Committed: Tue Nov 27 21:09:05 2018 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/zeppelin/service/NotebookService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2ea945f5/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
index 4cf3bf6..641e799 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java
@@ -1174,7 +1174,7 @@ public class NotebookService {
String paragraphText = p.getText() == null ? "" : p.getText();
paragraphText = (String) dmp.patchApply(patches, paragraphText)[0];
p.setText(paragraphText);
- callback.onSuccess(paragraphText, context);
+ callback.onSuccess(patchText, context);
} catch (IOException e) {
callback.onFailure(new IOException("Fail to patch", e), context);
}