From a935ef623db99a6796e6c11dae7ea8ff1f9af4ae Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 21 Feb 2017 13:15:15 +0000 Subject: [PATCH] We need to use a named return if we want to clobber in a defer --- .../matrix-org/dendrite/roomserver/input/latest_events.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go b/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go index ee61cf5aa..a450b7374 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go +++ b/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go @@ -9,7 +9,7 @@ import ( // updateLatestEvents updates the list of latest events for this room. func updateLatestEvents( db RoomEventDatabase, roomNID types.RoomNID, stateAtEvent types.StateAtEvent, event gomatrixserverlib.Event, -) error { +) (err error) { oldLatest, updater, err := db.GetLatestEventsForUpdate(roomNID) if err != nil { return err @@ -68,5 +68,5 @@ func updateLatestEvents( // The err should be nil at this point. // But when we call Close in the defer above it might set an error here. - return err + return }