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

10 years ago · 1a26905cc9
parent 33d62c2c66
commit 1a26905cc9
1 changed files with 4 additions and 1 deletions
--- a/synapse/state.py
+++ b/synapse/state.py
@ -157,7 +157,10 @@ class StateHandler(object):
            defer.returnValue(True)
            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
            # resolution.