From 615431ec46f57a47e01d47c056b0fe752afb9ef2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Sun, 23 May 2004 11:59:27 +0000
Subject: [PATCH] cosmetic changes (comment) + use of m.method_id instead of
method_id
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@894 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/CMFActivity/Activity/RAMQueue.py | 4 ++--
product/CMFActivity/Activity/SQLDict.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/product/CMFActivity/Activity/RAMQueue.py b/product/CMFActivity/Activity/RAMQueue.py
index ca8593fb6f..ede488d821 100755
--- a/product/CMFActivity/Activity/RAMQueue.py
+++ b/product/CMFActivity/Activity/RAMQueue.py
@@ -65,12 +65,12 @@ class RAMQueue(Queue):
for m in self.getQueue(activity_tool):
if not m.validate(self, activity_tool):
self.deleteMessage(activity_tool, m) # Trash messages which are not validated (no error handling)
- get_transaction().commit()
+ get_transaction().commit() # Start a new transaction
return 0 # Keep on ticking
activity_tool.invoke(m)
if m.is_executed:
self.deleteMessage(activity_tool, m) # Trash messages which are not validated (no error handling)
- get_transaction().commit()
+ get_transaction().commit() # Start a new transaction
return 0 # Keep on ticking
else:
# Start a new transaction and keep on to next message
diff --git a/product/CMFActivity/Activity/SQLDict.py b/product/CMFActivity/Activity/SQLDict.py
index e285e8bdd6..b7b9fa9b8a 100755
--- a/product/CMFActivity/Activity/SQLDict.py
+++ b/product/CMFActivity/Activity/SQLDict.py
@@ -210,7 +210,7 @@ class SQLDict(RAMDict):
if not m.is_executed: # Make sure message could be invoked
# The message no longer exists
raise ActivityFlushError, (
- 'Could not evaluate %s on %s' % (method_id , path))
+ 'Could not evaluate %s on %s' % (m.method_id , path))
else:
# The message no longer exists
raise ActivityFlushError, (
@@ -232,7 +232,7 @@ class SQLDict(RAMDict):
if not m.is_executed: # Make sure message could be invoked
# The message no longer exists
raise ActivityFlushError, (
- 'Could not evaluate %s on %s' % (method_id , path))
+ 'Could not evaluate %s on %s' % (m.method_id , path))
else:
# The message no longer exists
raise ActivityFlushError, (
--
2.30.9