bugfixed

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@682 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/CMFActivity/Activity/Queue.py

@@ -82,9 +82,11 @@ class Queue:
     activity_tool.deferredQueueMessage(self, m)  
   
   def deleteMessage(self, activity_tool, m):
-    if not self.isMessageDeleted(activity_tool, m):
+    if not getattr(m, 'is_deleted', 0):
+      # We try not to delete twice
+      # However this can not be garanteed in the case of messages loaded from SQL
       activity_tool.deferredDeleteMessage(self, m)  
-    # We must never deleted twice
+    m.is_deleted = 1
     
   def dequeueMessage(self, activity_tool, processing_node):
     pass

product/CMFActivity/Activity/RAMQueue.py

@@ -79,7 +79,7 @@ class RAMQueue(Queue):
     for m in self.queue:
       if object_path == m.object_path and (method_id is None or method_id == m.method_id):
         if invoke: activity_tool.invoke(m)
-        self.deleteMessage(m)
+        self.deleteMessage(activity_tool, m)
 
   def getMessageList(self, activity_tool, processing_node=None):
     new_queue = []