[CMF-checkins] CVS: CMF/CMFCore - MemberDataTool.py:1.25

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv1831

Modified Files:
	MemberDataTool.py 
Log Message:
Correctly treat the case where the object has already been deactivated
by the time cleanup is done. This is possible because request cleanup is
done after the transaction is committed or a aborted.


=== CMF/CMFCore/MemberDataTool.py 1.24 => 1.25 ===
--- CMF/CMFCore/MemberDataTool.py:1.24	Fri Mar 14 12:39:24 2003
+++ CMF/CMFCore/MemberDataTool.py	Thu Apr  3 12:08:14 2003
@@ -188,7 +188,11 @@
     def __init__(self, tool):
         self._tool = tool
     def __del__(self):
-        del self._tool._v_temps
+        try:
+            del self._tool._v_temps
+        except AttributeError:
+            # The object has already been deactivated.
+            pass
 
 
 class MemberData (SimpleItem):