Commit d8febe5a authored by Jim Fulton's avatar Jim Fulton Committed by Kirill Smelkov

fixed a bug in loadBefore

That was made effective by recent changes in ZODB that relied more on
loadBefore for MVCC.

Oddly the change makes this loadBefore match the version it was copied
from, which github says was last changed 13 years ago. (gulp, on
multiple levels).
parent dedf02e3
...@@ -200,7 +200,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage): ...@@ -200,7 +200,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
start_tid = tids[i] start_tid = tids[i]
j = i + 1 j = i + 1
if j == len(tids): if j == len(tids):
return None # the caller can't deal with current data end_tid = None
else: else:
end_tid = tids[j] end_tid = tids[j]
data = self.loadSerial(oid, start_tid) data = self.loadSerial(oid, start_tid)
...@@ -314,6 +314,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage): ...@@ -314,6 +314,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
self._tmp = [] self._tmp = []
def _takeOutGarbage(self, oid): def _takeOutGarbage(self, oid):
return
# take out the garbage. # take out the garbage.
referenceCount = self._referenceCount referenceCount = self._referenceCount
referenceCount_get = referenceCount.get referenceCount_get = referenceCount.get
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment