Commit 1177460d authored by Vincent Pelletier's avatar Vincent Pelletier

Release lock when setupCurrentSkin raises.

parent a7445c7c
...@@ -895,14 +895,13 @@ class ActivityTool (Folder, UniqueObject): ...@@ -895,14 +895,13 @@ class ActivityTool (Folder, UniqueObject):
acquired = timerservice_lock.acquire(0) acquired = timerservice_lock.acquire(0)
if not acquired: if not acquired:
return return
try:
# make sure our skin is set-up. On CMF 1.5 it's setup by acquisition, # 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 # 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 # by the timerserver request, which goes into the Zope Control_Panel
# calling it a second time is a harmless and cheap no-op. # calling it a second time is a harmless and cheap no-op.
# both setupCurrentSkin and REQUEST are acquired from containers. # both setupCurrentSkin and REQUEST are acquired from containers.
self.setupCurrentSkin(self.REQUEST) self.setupCurrentSkin(self.REQUEST)
try:
old_sm = getSecurityManager() old_sm = getSecurityManager()
try: try:
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment