Commit af78c458 authored by Jean-Paul Smets's avatar Jean-Paul Smets

COnflict resolved


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@394 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 36f8654c
...@@ -79,6 +79,7 @@ class SQLDict(RAMDict): ...@@ -79,6 +79,7 @@ class SQLDict(RAMDict):
if len(uid_list) > 0: if len(uid_list) > 0:
activity_tool.SQLDict_processMessage(uid = uid_list) activity_tool.SQLDict_processMessage(uid = uid_list)
get_transaction().commit() # Release locks before starting a potentially long calculation get_transaction().commit() # Release locks before starting a potentially long calculation
# This may lead (1 for 1,000,000 in case of reindexing) to messages left in processing state
m = self.loadMessage(line.message) m = self.loadMessage(line.message)
# Make sure object exists # Make sure object exists
if not m.validate(self, activity_tool): if not m.validate(self, activity_tool):
......
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