mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-02-12 05:54:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs

Browse source
This commit is contained in:
Neil Alexander 2022-02-02 15:42:22 +00:00
parent 2ca972ef76
commit f58ee67a7a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
roomserver/internal/input/input.go
View file

@ -157,18 +157,15 @@ func (r *Inputer) processRoomEventUsingUpdater(
} }
commit, err := r.processRoomEvent(ctx, updater, inputRoomEvent) commit, err := r.processRoomEvent(ctx, updater, inputRoomEvent)
if commit { if commit {
if err = updater.Commit(); err != nil { if cerr := updater.Commit(); err != nil {
return false, fmt.Errorf("updater.Commit: %w", err) return true, fmt.Errorf("updater.Commit: %w", cerr)
} }
} else { } else {
if rerr := updater.Rollback(); rerr != nil { if rerr := updater.Rollback(); rerr != nil {
return true, fmt.Errorf("updater.Rollback: %w", err) return true, fmt.Errorf("updater.Rollback: %w", rerr)
} }
} }
if err != nil { return false, err
return true, err
}
return false, nil
} }
// InputRoomEvents implements api.RoomserverInternalAPI // InputRoomEvents implements api.RoomserverInternalAPI