[Zodb-checkins] CVS: Zope3/src/zodb/storage - file.py:1.8.4.3

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv22956/storage

Modified Files:
      Tag: opaque-pickles-branch
	file.py 
Log Message:
Call splitrefs() instead of splitoids().

Remove uncommented try/except.


=== Zope3/src/zodb/storage/file.py 1.8.4.2 => 1.8.4.3 ===
--- Zope3/src/zodb/storage/file.py:1.8.4.2	Mon Mar 10 14:36:51 2003
+++ Zope3/src/zodb/storage/file.py	Mon Mar 10 15:12:03 2003
@@ -1577,7 +1577,7 @@
         except KeyError:
             raise POSKeyError(oid)
         h = self._read_data_header(pos)
-        refs = splitoids(self._file.read(h.nrefs * 8))
+        refs = splitrefs(self._file.read(h.nrefs * 8))
         if h.plen:
             data = self._file.read(h.plen)
         else:
@@ -1599,13 +1599,10 @@
             oid = rootl.pop()
             if oid in pindex:
                 continue
-            try:
-                p, refs, v = self._loada(oid, index)
-                rootl.extend(refs)
-                pindex[oid] = index[oid]
-            except Exception, err:
-                pindex[oid] = 0
-                error('Bad reference to %s: %s', u64(oid), err)
+            # XXX We might need to catch exceptions raised by _loada().
+            p, refs, v = self._loada(oid, index)
+            rootl.extend(refs)
+            pindex[oid] = index[oid]
         return pindex
 
     def pack(self):