From f6cd2770c071cb1322b4bb8481b4b37922bcc34e Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Fri, 25 Jul 2008 08:52:47 +0000 Subject: [PATCH] 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 --- product/CMFActivity/Activity/SQLDict.py | 7 +++++-- product/CMFActivity/Activity/SQLQueue.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/product/CMFActivity/Activity/SQLDict.py b/product/CMFActivity/Activity/SQLDict.py index e0f70d4f10..fcc2d77253 100644 --- a/product/CMFActivity/Activity/SQLDict.py +++ b/product/CMFActivity/Activity/SQLDict.py @@ -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 diff --git a/product/CMFActivity/Activity/SQLQueue.py b/product/CMFActivity/Activity/SQLQueue.py index 6b11370ce1..3d9630198d 100644 --- a/product/CMFActivity/Activity/SQLQueue.py +++ b/product/CMFActivity/Activity/SQLQueue.py @@ -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 -- 2.30.9