mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 14:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

That might be better

Browse source
This commit is contained in:
Neil Alexander 2022-06-15 11:02:00 +01:00
parent 17091ee8e6
commit 7f0bc0d4aa
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roomserver/state/state.go
View file

@ -1027,7 +1027,7 @@ func (v *StateResolution) loadStateEvents(
result := make([]*gomatrixserverlib.Event, 0, len(entries)) result := make([]*gomatrixserverlib.Event, 0, len(entries))
eventEntries := make([]types.StateEntry, 0, len(entries)) eventEntries := make([]types.StateEntry, 0, len(entries))
eventNIDs := make([]types.EventNID, 0, len(entries)) eventNIDs := make(types.EventNIDs, 0, len(entries))
for _, entry := range entries { for _, entry := range entries {
if e, ok := v.events[entry.EventNID]; ok { if e, ok := v.events[entry.EventNID]; ok {
result = append(result, e) result = append(result, e)
@ -1036,6 +1036,7 @@ func (v *StateResolution) loadStateEvents(
eventNIDs = append(eventNIDs, entry.EventNID) eventNIDs = append(eventNIDs, entry.EventNID)
} }
} }
sort.Sort(eventNIDs)
events, err := v.db.Events(ctx, eventNIDs) events, err := v.db.Events(ctx, eventNIDs)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err

2
roomserver/storage/shared/storage.go
View file

@ -495,7 +495,7 @@ func (d *Database) events(
results := make([]types.Event, 0, len(inputEventNIDs)) results := make([]types.Event, 0, len(inputEventNIDs))
for _, nid := range inputEventNIDs { for _, nid := range inputEventNIDs {
event, ok := events[nid] event, ok := events[nid]
if !ok { if !ok || event == nil {
panic("missing event") panic("missing event")
} }
results = append(results, types.Event{ results = append(results, types.Event{