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

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	FileStorage.py 
Log Message:
loadSerial must always return non-version data.


=== ZODB3/ZODB/FileStorage/FileStorage.py 1.1.2.20 => 1.1.2.21 ===
--- ZODB3/ZODB/FileStorage/FileStorage.py:1.1.2.20	Thu Dec 18 13:34:50 2003
+++ ZODB3/ZODB/FileStorage/FileStorage.py	Fri Dec 19 16:25:36 2003
@@ -567,6 +567,8 @@
             self._lock_release()
 
     def loadSerial(self, oid, serial):
+        # loadSerial must always return non-version data, because it
+        # is used by conflict resolution.
         self._lock_acquire()
         try:
             pos = self._lookup_pos(oid)
@@ -577,6 +579,8 @@
                 pos = h.prev
                 if not pos:
                     raise POSKeyError(oid)
+            if h.version:
+                return self._loadBack_impl(oid, h.pnv)[0]
             if h.plen:
                 return self._file.read(h.plen)
             else: