From c4f9268cfa6db8efefdff5faf0cd30c9c571a542 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 19 Jan 2012 13:02:46 +0100
Subject: [PATCH] make PadMessageHandler more robust against timing issues

---
 node/handler/PadMessageHandler.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/node/handler/PadMessageHandler.js b/node/handler/PadMessageHandler.js
index 0b48320b3..4a078542c 100644
--- a/node/handler/PadMessageHandler.js
+++ b/node/handler/PadMessageHandler.js
@@ -516,7 +516,12 @@ exports.updatePadClients = function(pad, callback)
         ], function(err)
         {
           if(ERR(err, callback)) return;
-            
+          // next if session has not been deleted
+          if(sessioninfos[session] == null)
+          {
+            callback(null);
+            return;
+          }
           if(author == sessioninfos[session].author)
           {
             socketio.sockets.sockets[session].json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
@@ -538,7 +543,10 @@ exports.updatePadClients = function(pad, callback)
       callback
     );
       
-    sessioninfos[session].rev = pad.getHeadRevisionNumber();
+    if(sessioninfos[session] != null)
+    {
+      sessioninfos[session].rev = pad.getHeadRevisionNumber();
+    }
   },callback);  
 }