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

Slices can be nil

Browse source
This commit is contained in:
Erik Johnston 2017-10-12 09:32:22 +01:00
parent 089506e6af
commit 2316f399c7
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go
View file

@ -146,7 +146,7 @@ func (s *OutputRoomEvent) processMessage(ore api.OutputNewRoomEvent) error {
} }
// Work out which hosts were joined at the event itself. // 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 { if err != nil {
return err return err
} }

14
src/github.com/matrix-org/dendrite/federationsender/storage/storage.go
View file

@ -71,11 +71,9 @@ func (d *Database) UpdateRoom(
roomID, oldEventID, newEventID string, roomID, oldEventID, newEventID string,
addHosts []types.JoinedHost, addHosts []types.JoinedHost,
removeHosts []string, removeHosts []string,
) (*[]types.JoinedHost, error) { ) (joinedHosts []types.JoinedHost, err error) {
var joinedHostsPtr *[]types.JoinedHost err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
err = d.insertRoom(ctx, txn, roomID)
err := common.WithTransaction(d.db, func(txn *sql.Tx) error {
err := d.insertRoom(ctx, txn, roomID)
if err != nil { if err != nil {
return err 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 { if err != nil {
return err return err
} }
joinedHostsPtr = &joinedHosts
for _, add := range addHosts { for _, add := range addHosts {
err = d.insertJoinedHosts(ctx, txn, roomID, add.MemberEventID, add.ServerName) err = d.insertJoinedHosts(ctx, txn, roomID, add.MemberEventID, add.ServerName)
if err != nil { if err != nil {
@ -114,5 +110,5 @@ func (d *Database) UpdateRoom(
} }
return d.updateRoom(ctx, txn, roomID, newEventID) return d.updateRoom(ctx, txn, roomID, newEventID)
}) })
return joinedHostsPtr, err return
} }