Commit d72a36fb authored by Yoshinori Okuji's avatar Yoshinori Okuji

Do not catch ConflictError.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3789 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ac0b02d4
...@@ -30,6 +30,7 @@ import ExtensionClass ...@@ -30,6 +30,7 @@ import ExtensionClass
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from Products.CMFCore import CMFCorePermissions from Products.CMFCore import CMFCorePermissions
from Acquisition import aq_base from Acquisition import aq_base
from ZODB.POSException import ConflictError
from zLOG import LOG from zLOG import LOG
...@@ -71,9 +72,9 @@ class ActiveObject(ExtensionClass.Base): ...@@ -71,9 +72,9 @@ class ActiveObject(ExtensionClass.Base):
# a queue can be provided as well as extra parameters # a queue can be provided as well as extra parameters
# which can be used for example to define deferred tasks # which can be used for example to define deferred tasks
try: try:
#if 1:
return activity_tool.activate(self, activity, active_process, **kw) return activity_tool.activate(self, activity, active_process, **kw)
#else: except ConflictError:
raise
except: except:
LOG("WARNING CMFActivity:",0, 'could not create activity for %s' % self.getRelativeUrl()) LOG("WARNING CMFActivity:",0, 'could not create activity for %s' % self.getRelativeUrl())
# If the portal_activities were not created # If the portal_activities were not created
...@@ -112,6 +113,8 @@ class ActiveObject(ExtensionClass.Base): ...@@ -112,6 +113,8 @@ class ActiveObject(ExtensionClass.Base):
if activity_tool is None: return 0 # Do nothing if no portal_activities if activity_tool is None: return 0 # Do nothing if no portal_activities
try: try:
return activity_tool.hasActivity(self, **kw) return activity_tool.hasActivity(self, **kw)
except ConflictError:
raise
except: except:
# If the portal_activities were not created # If the portal_activities were not created
# there can not be any activity # there can not be any activity
......
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