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

@@ -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