public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1902 from ether/fix/handle-message-continuation 

Don't stop processing changesets if there is an error
pull/1906/merge
John McLear 2013-09-28 23:38:26 -07:00
parent e573461c9b 7f7d506ff3
commit f59df2bb80
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/handler/PadMessageHandler.js
View File

@ -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);