[Zope3-checkins] CVS: ZODB4/src/zodb/zeo - cache.py:1.8

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/src/zodb/zeo
In directory cvs.zope.org:/tmp/cvs-serv10460

Modified Files:
	cache.py 
Log Message:
Bunch of small fixes accidentally made in a build directory before
previous checkin.


=== ZODB4/src/zodb/zeo/cache.py 1.7 => 1.8 ===
--- ZODB4/src/zodb/zeo/cache.py:1.7	Fri Jun 20 13:53:45 2003
+++ ZODB4/src/zodb/zeo/cache.py	Fri Jun 20 13:56:28 2003
@@ -373,13 +373,13 @@
                 if dlen:
                     data = read(dlen)
                     self._trace(0x2A, oid, version, h[19:], dlen)
-                    # If vlen, then we don't have the version info to
-                    # pass to copytocurrent().
-                    if vlen:
-                        vheader = read(vlen)
-                    else:
-                        vheader = None
                     if (p < 0) != self._current:
+                        # If the cache read we are copying has version info,
+                        # we need to pass the header to copytocurrent().
+                        if vlen:
+                            vheader = read(vlen + 4)
+                        else:
+                            vheader = None
                         self._copytocurrent(ap, tlen, dlen, vlen, h, oid,
                                             data, vheader)
                     return data, h[19:]