[Zodb-checkins] CVS: ZODB3/ZODB/FileStorage - FileStorage.py:1.1.2.22

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB/FileStorage
In directory cvs.zope.org:/tmp/cvs-serv26665/ZODB/FileStorage

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	FileStorage.py 
Log Message:
Merge the head to the mvcc branch.

This merge should be the final preparation for merging the branch to
the trunk.


=== ZODB3/ZODB/FileStorage/FileStorage.py 1.1.2.21 => 1.1.2.22 ===
--- ZODB3/ZODB/FileStorage/FileStorage.py:1.1.2.21	Fri Dec 19 16:25:36 2003
+++ ZODB3/ZODB/FileStorage/FileStorage.py	Tue Dec 23 14:05:52 2003
@@ -650,11 +650,13 @@
                     cached_tid = h.tid
 
                 if serial != cached_tid:
-                    data = self.tryToResolveConflict(oid, cached_tid,
+                    rdata = self.tryToResolveConflict(oid, cached_tid,
                                                      serial, data)
-                    if data is None:
+                    if rdata is None:
                         raise POSException.ConflictError(
-                            oid=oid, serials=(cached_tid, serial))
+                            oid=oid, serials=(cached_tid, serial), data=data)
+                    else:
+                        data = rdata
 
             pos = self._pos
             here = pos + self._tfile.tell() + self._thl