[Zope-Checkins] CVS: ZODB3/ZODB - FileStorage.py:1.106

[Guido van Rossum]

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

Modified Files:
	FileStorage.py 
Log Message:
Merge restore() fix from release branch.

=== ZODB3/ZODB/FileStorage.py 1.105 => 1.106 ===
--- ZODB3/ZODB/FileStorage.py:1.105	Sat Sep 28 23:40:37 2002
+++ ZODB3/ZODB/FileStorage.py	Wed Oct 16 17:52:19 2002
@@ -778,6 +778,9 @@
                                                              h)
                 if doid != oid:
                     raise CorruptedDataError, h
+                if vlen > 0:
+                    # non-version data pointer
+                    pnv = self._file.read(8)
             # Calculate the file position in the temporary file
             here = self._pos + self._tfile.tell() + self._thl
             # And update the temp file index