From 2316f399c7b0448d0f2a58c622688acb2b234e28 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 12 Oct 2017 09:32:22 +0100 Subject: [PATCH] Slices can be nil --- .../federationsender/consumers/roomserver.go | 2 +- .../dendrite/federationsender/storage/storage.go | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go b/src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go index 41894113f..693fc4e1d 100644 --- a/src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go +++ b/src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go @@ -146,7 +146,7 @@ func (s *OutputRoomEvent) processMessage(ore api.OutputNewRoomEvent) error { } // Work out which hosts were joined at the event itself. - joinedHostsAtEvent, err := s.joinedHostsAtEvent(ore, *oldJoinedHosts) + joinedHostsAtEvent, err := s.joinedHostsAtEvent(ore, oldJoinedHosts) if err != nil { return err } diff --git a/src/github.com/matrix-org/dendrite/federationsender/storage/storage.go b/src/github.com/matrix-org/dendrite/federationsender/storage/storage.go index 27a50a12b..8e577de45 100644 --- a/src/github.com/matrix-org/dendrite/federationsender/storage/storage.go +++ b/src/github.com/matrix-org/dendrite/federationsender/storage/storage.go @@ -71,11 +71,9 @@ func (d *Database) UpdateRoom( roomID, oldEventID, newEventID string, addHosts []types.JoinedHost, removeHosts []string, -) (*[]types.JoinedHost, error) { - var joinedHostsPtr *[]types.JoinedHost - - err := common.WithTransaction(d.db, func(txn *sql.Tx) error { - err := d.insertRoom(ctx, txn, roomID) +) (joinedHosts []types.JoinedHost, err error) { + err = common.WithTransaction(d.db, func(txn *sql.Tx) error { + err = d.insertRoom(ctx, txn, roomID) if err != nil { return err } @@ -96,13 +94,11 @@ func (d *Database) UpdateRoom( } } - joinedHosts, err := d.selectJoinedHosts(ctx, txn, roomID) + joinedHosts, err = d.selectJoinedHosts(ctx, txn, roomID) if err != nil { return err } - joinedHostsPtr = &joinedHosts - for _, add := range addHosts { err = d.insertJoinedHosts(ctx, txn, roomID, add.MemberEventID, add.ServerName) if err != nil { @@ -114,5 +110,5 @@ func (d *Database) UpdateRoom( } return d.updateRoom(ctx, txn, roomID, newEventID) }) - return joinedHostsPtr, err + return }