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

Merge pull request #341 from azul/race_condition 

make PadMessageHandler more robust against timing issues
pull/342/merge
Peter 'Pita' Martischka 2012-01-22 06:25:35 -08:00
parent 6b19ffeaf6 c4f9268cfa
commit 165f26947d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/handler/PadMessageHandler.js
View File

@ -516,7 +516,12 @@ exports.updatePadClients = function(pad, callback)
], function(err) ], function(err)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
// next if session has not been deleted
if(sessioninfos[session] == null)
{
callback(null);
return;
}
if(author == sessioninfos[session].author) if(author == sessioninfos[session].author)
{ {
socketio.sockets.sockets[session].json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}}); socketio.sockets.sockets[session].json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
@ -538,7 +543,10 @@ exports.updatePadClients = function(pad, callback)
callback callback
); );
if(sessioninfos[session] != null)
{
sessioninfos[session].rev = pad.getHeadRevisionNumber(); sessioninfos[session].rev = pad.getHeadRevisionNumber();
}
},callback); },callback);
} }