mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-28 15:08:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix pontenial bug in state resolution handler that compared dicts rather than their id's

Browse source
This commit is contained in:
Erik Johnston 2014-08-15 11:41:11 +01:00
parent 33d62c2c66
commit 1a26905cc9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/state.py
View file

@ -157,7 +157,10 @@ class StateHandler(object):
defer.returnValue(True) defer.returnValue(True)
return return
if new_branch[-1] == current_branch[-1]: n = new_branch[-1]
c = current_branch[-1]
if n.pdu_id == c.pdu_id and n.origin == c.origin:
# We have all the PDUs we need, so we can just do the conflict # We have all the PDUs we need, so we can just do the conflict
# resolution. # resolution.