[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/Image.py Merge rev 38757 from 2.8 branch.

[Tim Peters]

Log message for revision 38758:
  Merge rev 38757 from 2.8 branch.
  
  Putative fix for Collector 1912.
  
  File._read_data():  This uses savepoints just to get oids assigned
  and to free memory, with no possibility of rollback.  Therefore
  "optimistic" savepoints should be used:  there's no reason here to
  insist that any data managers involved support rollback.
  

Changed:
  U   Zope/trunk/lib/python/OFS/Image.py

-=-
Modified: Zope/trunk/lib/python/OFS/Image.py
===================================================================
--- Zope/trunk/lib/python/OFS/Image.py	2005-10-04 21:13:22 UTC (rev 38757)
+++ Zope/trunk/lib/python/OFS/Image.py	2005-10-04 21:23:28 UTC (rev 38758)
@@ -219,7 +219,7 @@
                     return True
 
                 ranges = HTTPRangeSupport.expandRanges(ranges, self.size)
-                                
+
                 if len(ranges) == 1:
                     # Easy case, set extra header and return partial set.
                     start, end = ranges[0]
@@ -402,10 +402,10 @@
                 return result
 
         self.ZCacheable_set(None)
-            
+
         data=self.data
         if type(data) is type(''):
-            RESPONSE.setBase(None) 
+            RESPONSE.setBase(None)
             return data
 
         while data is not None:
@@ -516,7 +516,7 @@
 
         # Make sure we have an _p_jar, even if we are a new object, by
         # doing a sub-transaction commit.
-        transaction.commit(1)
+        transaction.savepoint(optimistic=True)
 
         if self._p_jar is None:
             # Ugh
@@ -533,7 +533,7 @@
             if pos < n:
                 pos = 0 # we always want at least n bytes
             seek(pos)
-            
+
             # Create the object and assign it a next pointer
             # in the same transaction, so that there is only
             # a single database update for it.
@@ -542,7 +542,7 @@
             data.next = next
 
             # Save the object so that we can release its memory.
-            transaction.commit(1)
+            transaction.savepoint(optimistic=True)
             data._p_deactivate()
             # The object should be assigned an oid and be a ghost.
             assert data._p_oid is not None