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

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	FileStorage.py 
Log Message:
Read the pickle before the txn header,
otherwise the fp is messed up.


=== ZODB3/ZODB/FileStorage/FileStorage.py 1.1.2.4 => 1.1.2.5 ===
--- ZODB3/ZODB/FileStorage/FileStorage.py:1.1.2.4	Wed Nov  5 23:33:44 2003
+++ ZODB3/ZODB/FileStorage/FileStorage.py	Tue Nov 11 16:40:06 2003
@@ -547,8 +547,9 @@
                 th = self._read_txn_header(tloc)
                 return data, serial, th.tid
             if h.plen:
+                data = self._file.read(h.plen)
                 th = self._read_txn_header(h.tloc)
-                return self._file.read(h.plen), h.serial, th.tid
+                return data, h.serial, th.tid
             else:
                 data, _, _, tloc = self._loadBack_impl(oid, h.back)
                 th = self._read_txn_header(h.tloc)