fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prettify session handling in handleUserChanges 

Also add a comment to explain what's going on with thisSession.
No changes in behavior.
This commit is contained in:
Richard Braakman 2012-09-27 23:05:18 +03:00
parent f1b4206cad
commit 7aaef01346
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,9 @@ function handleUserChanges(client, message)
var baseRev = message.data.baseRev; var baseRev = message.data.baseRev;
var wireApool = (new AttributePool()).fromJsonable(message.data.apool); var wireApool = (new AttributePool()).fromJsonable(message.data.apool);
var changeset = message.data.changeset; var changeset = message.data.changeset;
var thisAuthor = sessioninfos[client.id].author; // The client might disconnect between our callbacks. We should still
// finish processing the changeset, so keep a reference to the session.
var thisSession = sessioninfos[client.id];
var r, apool, pad; var r, apool, pad;
@ -473,7 +475,7 @@ function handleUserChanges(client, message)
//get the pad //get the pad
function(callback) function(callback)
{ {
padManager.getPad(sessioninfos[client.id].padId, function(err, value) padManager.getPad(thisSession.padId, function(err, value)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
pad = value; pad = value;
@ -550,7 +552,7 @@ function handleUserChanges(client, message)
return; return;
} }
pad.appendRevision(changeset, thisAuthor); pad.appendRevision(changeset, thisSession.author);
var correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool); var correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool);
if (correctionChangeset) { if (correctionChangeset) {