From 1ae98683feb71307bec3de57d9b8b10b3cef4732 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Tue, 29 Jul 2008 20:26:53 +0000 Subject: [PATCH] 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 --- product/CMFActivity/Activity/SQLDict.py | 7 ++----- product/CMFActivity/Activity/SQLQueue.py | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/product/CMFActivity/Activity/SQLDict.py b/product/CMFActivity/Activity/SQLDict.py index fcc2d77253..e0f70d4f10 100644 --- a/product/CMFActivity/Activity/SQLDict.py +++ b/product/CMFActivity/Activity/SQLDict.py @@ -540,11 +540,8 @@ 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 (only if message is marked as new) - if line.processing_node == -1: - validate_value = m.validate(self, activity_tool) - else: - validate_value = VALID + # First Validate + validate_value = m.validate(self, activity_tool) 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 3d9630198d..6b11370ce1 100644 --- a/product/CMFActivity/Activity/SQLQueue.py +++ b/product/CMFActivity/Activity/SQLQueue.py @@ -402,11 +402,8 @@ class SQLQueue(RAMQueue, SQLBase): method_id = line.method_id m = self.loadMessage(line.message, uid = line.uid) if invoke: - # 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 + # First Validate + validate_value = m.validate(self, activity_tool) 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