Skip to content

Commit 165f269

Browse files
committed
Merge pull request #341 from azul/race_condition
make PadMessageHandler more robust against timing issues
2 parents 6b19ffe + c4f9268 commit 165f269

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

node/handler/PadMessageHandler.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,12 @@ exports.updatePadClients = function(pad, callback)
516516
], function(err)
517517
{
518518
if(ERR(err, callback)) return;
519-
519+
// next if session has not been deleted
520+
if(sessioninfos[session] == null)
521+
{
522+
callback(null);
523+
return;
524+
}
520525
if(author == sessioninfos[session].author)
521526
{
522527
socketio.sockets.sockets[session].json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
@@ -538,7 +543,10 @@ exports.updatePadClients = function(pad, callback)
538543
callback
539544
);
540545

541-
sessioninfos[session].rev = pad.getHeadRevisionNumber();
546+
if(sessioninfos[session] != null)
547+
{
548+
sessioninfos[session].rev = pad.getHeadRevisionNumber();
549+
}
542550
},callback);
543551
}
544552

0 commit comments

Comments
 (0)