MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-30 10:03:45 +01:00
Code Issues Releases Wiki Activity

Ensure state res results are unique

Browse source
This commit is contained in:
Neil Alexander 2020-03-30 09:51:45 +01:00
parent 05e1ae8745
commit 664f31ec98
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/state/state.go
View file

@ -672,7 +672,7 @@ func (v StateResolution) calculateStateAfterManyEvents(
return return
} }
algorithm = "full_state_with_conflicts" algorithm = "full_state_with_conflicts"
state = resolved state = resolved[:util.SortAndUnique(stateEntrySorter(resolved))]
} else { } else {
algorithm = "full_state_no_conflicts" algorithm = "full_state_no_conflicts"
// 6) There weren't any conflicts // 6) There weren't any conflicts