Move setupCurrentSkin execution inside the try...finally block, so if it...

Move setupCurrentSkin execution inside the try...finally block, so if it happens to raise the lock is properly released.


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

product/ERP5/Tool/AlarmTool.py

@@ -205,13 +205,13 @@ class AlarmTool(BaseTool):
     acquired = last_tic_lock.acquire(0)
     if not acquired:
       return
-    # make sure our skin is set-up. On CMF 1.5 it's setup by acquisition,
-    # but on 2.2 it's by traversal, and our site probably wasn't traversed
-    # by the timerserver request, which goes into the Zope Control_Panel
-    # calling it a second time is a harmless and cheap no-op.
-    # both setupCurrentSkin and REQUEST are acquired from containers.
-    self.setupCurrentSkin(self.REQUEST)
     try:
+      # make sure our skin is set-up. On CMF 1.5 it's setup by acquisition,
+      # but on 2.2 it's by traversal, and our site probably wasn't traversed
+      # by the timerserver request, which goes into the Zope Control_Panel
+      # calling it a second time is a harmless and cheap no-op.
+      # both setupCurrentSkin and REQUEST are acquired from containers.
+      self.setupCurrentSkin(self.REQUEST)
       # only start when we are the alarmNode
       alarmNode = self.getAlarmNode()
       current_node = self.getCurrentNode()