From af78c458fb4abde602263577733eb1d7543feec6 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Sun, 8 Feb 2004 11:26:58 +0000
Subject: [PATCH] COnflict resolved

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@394 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/CMFActivity/Activity/SQLDict.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/product/CMFActivity/Activity/SQLDict.py b/product/CMFActivity/Activity/SQLDict.py
index 75c5a33cec..1d92601129 100755
--- a/product/CMFActivity/Activity/SQLDict.py
+++ b/product/CMFActivity/Activity/SQLDict.py
@@ -79,6 +79,7 @@ class SQLDict(RAMDict):
       if len(uid_list) > 0:
         activity_tool.SQLDict_processMessage(uid = uid_list)
       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)
       # Make sure object exists
       if not m.validate(self, activity_tool):
-- 
2.30.9