Commit 357379f1 authored by Jim Fulton's avatar Jim Fulton

Server doesn't call serialnos for deleted objects

parent 0eceaf66
...@@ -724,7 +724,10 @@ class ClientStorage(object): ...@@ -724,7 +724,10 @@ class ClientStorage(object):
if tbuf.exception: if tbuf.exception:
raise tbuf.exception raise tbuf.exception
if tbuf.serials:
return list(tbuf.serials.items()) return list(tbuf.serials.items())
else:
return None
def tpc_transaction(self): def tpc_transaction(self):
return self._transaction return self._transaction
......
...@@ -83,7 +83,7 @@ class TransactionBuffer: ...@@ -83,7 +83,7 @@ class TransactionBuffer:
for i in range(self.count): for i in range(self.count):
oid, data = unpickler.load() oid, data = unpickler.load()
seen.add(oid) seen.add(oid)
yield oid, data, serials[oid] == ResolvedSerial yield oid, data, serials.get(oid) == ResolvedSerial
# We may have leftover serials because undo # We may have leftover serials because undo
for oid, serial in serials.items(): for oid, serial in serials.items():
......
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