Ensure that SQLQueue never leave messages as processed.

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

product/CMFActivity/Activity/SQLQueue.py

@@ -95,16 +95,19 @@ class SQLQueue(RAMQueue):
       # Make sure message can not be processed anylonger
       activity_tool.SQLQueue_processMessage(uid=line.uid)
       get_transaction().commit() # Release locks before starting a potentially long calculation
+
+      # At this point, the message is marked as processed.
+      try:
         m = self.loadMessage(line.message)
         # Make sure object exists
         validation_state = m.validate(self, activity_tool)
         if validation_state is not VALID:
           if validation_state in (EXCEPTION, INVALID_PATH):
             if line.priority > MAX_PRIORITY:
-            # This is an error
-            activity_tool.SQLQueue_assignMessage(uid=line.uid, processing_node = VALIDATE_ERROR_STATE)
-                                                                              # Assign message back to 'error' state
-            #m.notifyUser(activity_tool)                                       # Notify Error
+              # This is an error.
+              # Assign message back to 'error' state.
+              activity_tool.SQLQueue_assignMessage(uid=line.uid,
+                                                   processing_node = VALIDATE_ERROR_STATE)
               get_transaction().commit()                                        # and commit
             else:
               # Lower priority
@@ -115,7 +118,15 @@ class SQLQueue(RAMQueue):
             activity_tool.SQLQueue_setPriority(uid = line.uid, date = next_processing_date,
                                                 priority = line.priority)
             get_transaction().commit() # Release locks before starting a potentially long calculation
-      else:
+          return 0
+      except:
+        # If any exception occurs, catch it and delay the operation.
+        get_transaction().abort()
+        activity_tool.SQLQueue_setPriority(uid = line.uid, date = next_processing_date,
+                                           priority = line.priority)
+        get_transaction().commit()
+        return 0
+
       # Try to invoke
       activity_tool.invoke(m) # Try to invoke the message - what happens if read conflict error restarts transaction ?
       if m.is_executed:                                          # Make sure message could be invoked