Split security handling and unlocking into 2 separate try..except levels, for...

Split security handling and unlocking into 2 separate try..except levels, for the sake of robustness.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19176 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/CMFActivity/ActivityTool.py

@@ -558,6 +558,7 @@ class ActivityTool (Folder, UniqueObject):
         if not acquired:
           return
 
+        try:
           old_sm = getSecurityManager()
           try:
             try:
@@ -591,8 +592,9 @@ class ActivityTool (Folder, UniqueObject):
               # Catch ALL exception to avoid killing timerserver.
               LOG('ActivityTool', ERROR, 'process_timer received an exception', error=sys.exc_info())
           finally:
-          timerservice_lock.release()
             setSecurityManager(old_sm)
+        finally:
+          timerservice_lock.release()
 
     security.declarePublic('distribute')
     def distribute(self, node_count=1):