Commit f055e108 authored by Vincent Pelletier's avatar Vincent Pelletier

Word-wrap at 79 chars.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2624 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 2e712075
...@@ -242,8 +242,8 @@ class RevisionIndex(MQIndex): ...@@ -242,8 +242,8 @@ class RevisionIndex(MQIndex):
pass pass
else: else:
if result < tid_list[-1]: if result < tid_list[-1]:
# An invalidation happened from a transaction later than our # An invalidation happened from a transaction later than
# most recent view of this object, so we cannot answer. # our most recent view of this object, so we cannot answer.
result = None result = None
return result return result
...@@ -256,7 +256,8 @@ class RevisionIndex(MQIndex): ...@@ -256,7 +256,8 @@ class RevisionIndex(MQIndex):
class Application(object): class Application(object):
"""The client node application.""" """The client node application."""
def __init__(self, master_nodes, name, connector=None, compress=True, **kw): def __init__(self, master_nodes, name, connector=None, compress=True,
**kw):
# Start polling thread # Start polling thread
self.em = EventManager() self.em = EventManager()
self.poll_thread = ThreadedPoll(self.em, name=name) self.poll_thread = ThreadedPoll(self.em, name=name)
...@@ -776,7 +777,8 @@ class Application(object): ...@@ -776,7 +777,8 @@ class Application(object):
resolved_serial_set = resolved_conflict_serial_dict.setdefault( resolved_serial_set = resolved_conflict_serial_dict.setdefault(
oid, set()) oid, set())
conflict_serial = max(conflict_serial_set) conflict_serial = max(conflict_serial_set)
if resolved_serial_set and conflict_serial <= max(resolved_serial_set): if resolved_serial_set and conflict_serial <= max(
resolved_serial_set):
# A later serial has already been resolved, skip. # A later serial has already been resolved, skip.
resolved_serial_set.update(conflict_serial_set) resolved_serial_set.update(conflict_serial_set)
continue continue
......
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