Commit 1ae98683 authored by Yoshinori Okuji's avatar Yoshinori Okuji

I do not understand what vincent wanted to do, and his change only broke the code, so I revert it.

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