diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 11:41:11 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 11:41:20 +0100 |
| commit | 1a26905cc9b0c957c9619f55705b88f7d08c3071 (patch) | |
| tree | eb8e98a4e619e6cf75bfc7aee47b38c573f6b77c /synapse/state.py | |
| parent | Remember to reflect membership LEAVE events to the leaving member so they kno... (diff) | |
| download | synapse-1a26905cc9b0c957c9619f55705b88f7d08c3071.tar.xz | |
Fix pontenial bug in state resolution handler that compared dicts rather than their id's
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py index b081de8f4f..d8977b61ea 100644 --- 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. |