Anonymous avatar Anonymous committed b8bc930

Catch case where clean_up is called by 2 concurrent threads

Comments (0)

Files changed (1)

cherrypy/filters/sessionfilter.py

             if expirationTime < now:
                 toBeDeleted.append(id)
         for id in toBeDeleted:
-            sess.onDeleteSession(cherrypy._session_data_holder[id])
-            del cherrypy._session_data_holder[id]
+            try:
+                del cherrypy._session_data_holder[id]
+                sess.onDeleteSession(cherrypy._session_data_holder[id])
+            except KeyError:
+                # The session probably got deleted by a concurrent thread
+                #   Safe to ignore this case
+                pass
 
 
 class FileStorage:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.