diff options
author | Marcel Klehr <mklehr@gmx.net> | 2013-09-23 16:38:55 +0200 |
---|---|---|
committer | Marcel Klehr <mklehr@gmx.net> | 2013-09-23 16:38:55 +0200 |
commit | 7f7d506ff34b4d7477c31290e8bc363f9265bb10 (patch) | |
tree | 0648797e67fc0e7f7826ec94b254bcec3b33d50b /src/node/handler/PadMessageHandler.js | |
parent | 7898c350f7f8a012af832bd062621a9ead6bdef1 (diff) | |
download | etherpad-lite-7f7d506ff34b4d7477c31290e8bc363f9265bb10.zip |
Don't stop processing changesets if there is an error
fixes #1895
Diffstat (limited to 'src/node/handler/PadMessageHandler.js')
-rw-r--r-- | src/node/handler/PadMessageHandler.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 7d293926..a79d2410 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -617,7 +617,7 @@ function handleUserChanges(data, cb) // There is an error in this changeset, so just refuse it console.warn("Can't apply USER_CHANGES "+changeset+", because: "+e); client.json.send({disconnect:"badChangeset"}); - return; + return callback(); } //ex. adoptChangesetAttribs @@ -653,7 +653,7 @@ function handleUserChanges(data, cb) }catch(e){ console.warn("Can't apply USER_CHANGES "+changeset+", possibly because of mismatched follow error"); client.json.send({disconnect:"badChangeset"}); - return; + return callback(); } if ((r - baseRev) % 200 == 0) { // don't let the stack get too deep @@ -676,8 +676,7 @@ function handleUserChanges(data, cb) { console.warn("Can't apply USER_CHANGES "+changeset+" with oldLen " + Changeset.oldLen(changeset) + " to document of length " + prevText.length); client.json.send({disconnect:"badChangeset"}); - callback(); - return; + return callback(); } pad.appendRevision(changeset, thisSession.author); |