From d72a36fbfbb2b15c6ce4812fd1d6ef38071a0c47 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Thu, 15 Sep 2005 16:24:15 +0000 Subject: [PATCH] Do not catch ConflictError. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3789 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/CMFActivity/ActiveObject.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/product/CMFActivity/ActiveObject.py b/product/CMFActivity/ActiveObject.py index 8762c28d08..127c9f1704 100755 --- a/product/CMFActivity/ActiveObject.py +++ b/product/CMFActivity/ActiveObject.py @@ -30,6 +30,7 @@ import ExtensionClass from AccessControl import ClassSecurityInfo from Products.CMFCore import CMFCorePermissions from Acquisition import aq_base +from ZODB.POSException import ConflictError from zLOG import LOG @@ -71,9 +72,9 @@ class ActiveObject(ExtensionClass.Base): # a queue can be provided as well as extra parameters # which can be used for example to define deferred tasks try: - #if 1: return activity_tool.activate(self, activity, active_process, **kw) - #else: + except ConflictError: + raise except: LOG("WARNING CMFActivity:",0, 'could not create activity for %s' % self.getRelativeUrl()) # If the portal_activities were not created @@ -112,6 +113,8 @@ class ActiveObject(ExtensionClass.Base): if activity_tool is None: return 0 # Do nothing if no portal_activities try: return activity_tool.hasActivity(self, **kw) + except ConflictError: + raise except: # If the portal_activities were not created # there can not be any activity -- 2.30.9