Commit f6cd2770 authored by Vincent Pelletier's avatar Vincent Pelletier

Forgot to replace 1 more validation occurence in each queue.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22648 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3b6cfdfb
......@@ -540,8 +540,11 @@ class SQLDict(RAMDict, SQLBase):
if not method_dict.has_key(m.method_id):
method_dict[m.method_id] = 1 # Prevents calling invoke twice
if invoke:
# First Validate
validate_value = m.validate(self, activity_tool)
# First Validate (only if message is marked as new)
if line.processing_node == -1:
validate_value = m.validate(self, activity_tool)
else:
validate_value = VALID
if validate_value is VALID:
activity_tool.invoke(m) # Try to invoke the message - what happens if invoke calls flushActivity ??
if m.is_executed != MESSAGE_EXECUTED: # Make sure message could be invoked
......
......@@ -402,8 +402,11 @@ class SQLQueue(RAMQueue, SQLBase):
method_id = line.method_id
m = self.loadMessage(line.message, uid = line.uid)
if invoke:
# First Validate
validate_value = m.validate(self, activity_tool)
# First Validate (only if message is marked as new)
if line.processing_node == -1:
validate_value = m.validate(self, activity_tool)
else:
validate_value = VALID
if validate_value is VALID:
activity_tool.invoke(m) # Try to invoke the message - what happens if invoke calls flushActivity ??
if m.is_executed != MESSAGE_EXECUTED: # Make sure message could be invoked
......
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