[Zope3-checkins] CVS: ZODB4/src/zodb/zeo - cache.py:1.9
Jeremy Hylton
jeremy@zope.com
Fri, 20 Jun 2003 14:51:46 -0400
Update of /cvs-repository/ZODB4/src/zodb/zeo
In directory cvs.zope.org:/tmp/cvs-serv18689
Modified Files:
cache.py
Log Message:
Previous fix uncovered another assertion failure.
=== ZODB4/src/zodb/zeo/cache.py 1.8 => 1.9 ===
--- ZODB4/src/zodb/zeo/cache.py:1.8 Fri Jun 20 13:56:28 2003
+++ ZODB4/src/zodb/zeo/cache.py Fri Jun 20 14:51:45 2003
@@ -432,6 +432,7 @@
# This shortens the record.
tlen = 31 + oidlen + dlen
vlen = 0
+ vheader = None
# (oidlen:2, reserved:6, status:1, tlen:4,
# vlen:2, dlen:4, serial:8)
header = header[:9] + pack(">IHI", tlen, vlen, dlen) + header[-8:]
@@ -460,7 +461,9 @@
l.append(vdata)
l.append(vserial)
else:
- assert None is vheader is vdata is vserial
+ assert None is vheader is vdata is vserial, (
+ vlen, vheader, vdata, vserial)
+
l.append(header[9:13]) # copy of tlen
g = self._f[self._current]
g.seek(self._pos)