From 4ccac6957b382213aa030ef3b6d6d4af4378769f Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 27 May 2020 18:24:37 +0100 Subject: [PATCH] Close the txn at the right time --- roomserver/storage/shared/membership_updater.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/roomserver/storage/shared/membership_updater.go b/roomserver/storage/shared/membership_updater.go index d3c17a9b5..5ddf6d84d 100644 --- a/roomserver/storage/shared/membership_updater.go +++ b/roomserver/storage/shared/membership_updater.go @@ -43,17 +43,16 @@ func NewMembershipUpdater( return nil, err } - if !useTxns { - txn.Commit() // nolint: errcheck - txn = nil - } - updater, err := d.membershipUpdaterTxn(ctx, txn, roomNID, targetUserNID, targetLocal) if err != nil { return nil, err } succeeded = true + if !useTxns { + txn.Commit() // nolint: errcheck + updater.transaction.txn = nil + } return updater, nil } @@ -63,7 +62,7 @@ func (d *Database) membershipUpdaterTxn( roomNID types.RoomNID, targetUserNID types.EventStateKeyNID, targetLocal bool, -) (types.MembershipUpdater, error) { +) (*membershipUpdater, error) { if err := d.MembershipTable.InsertMembership(ctx, txn, roomNID, targetUserNID, targetLocal); err != nil { return nil, err