diff options
| author | oliverpool <3864879+oliverpool@users.noreply.github.com> | 2020-08-25 14:11:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 13:11:52 +0100 |
| commit | a4db43e0969125db899dae465daf3ab1385c8ce9 (patch) | |
| tree | a6fa17159a4a5e066b56751c849edba628b710e9 /roomserver | |
| parent | c8b873abc8cb20227774c648b7a774214c8f3752 (diff) | |
Don't overwrite global err before return (#1293)
Signed-off-by: Olivier Charvin <git@olivier.pfad.fr>
Diffstat (limited to 'roomserver')
| -rw-r--r-- | roomserver/internal/input_latest_events.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/roomserver/internal/input_latest_events.go b/roomserver/internal/input_latest_events.go index 3be5218d..f11a78d7 100644 --- a/roomserver/internal/input_latest_events.go +++ b/roomserver/internal/input_latest_events.go @@ -60,12 +60,7 @@ func (r *RoomserverInternalAPI) updateLatestEvents( return fmt.Errorf("r.DB.GetLatestEventsForUpdate: %w", err) } succeeded := false - defer func() { - txerr := sqlutil.EndTransaction(updater, &succeeded) - if err == nil && txerr != nil { - err = txerr - } - }() + defer sqlutil.EndTransactionWithCheck(updater, &succeeded, &err) u := latestEventsUpdater{ ctx: ctx, |