From 8712bfbf9b1c0ad1e620a52638eaf44e0bfbe192 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Fri, 14 May 2004 07:06:06 +0000
Subject: [PATCH] works now with subtransactions

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@876 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/CMFActivity/ActivityBuffer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/product/CMFActivity/ActivityBuffer.py b/product/CMFActivity/ActivityBuffer.py
index 173214d02d..e7fdd78c36 100755
--- a/product/CMFActivity/ActivityBuffer.py
+++ b/product/CMFActivity/ActivityBuffer.py
@@ -86,7 +86,9 @@ class ActivityBuffer(TM):
             return
         self._tlock.release()
 
-    def tpc_prepare(self, *ignored):
+    def tpc_prepare(self, transaction, sub=None):
+        if sub is not None: # Do nothing if it is a subtransaction
+          return
         if not self.requires_prepare: return
         self.requires_prepare = 0
         from thread import get_ident
-- 
2.30.9