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

Merge branch 'master' into kegan/outbound-fed-e2e-keys

Browse source
This commit is contained in:
Kegsay 2020-07-21 17:46:39 +01:00 committed by GitHub
parent 3fb18b172d f54689f862
commit 3e5dbd24f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/storage/shared/storage.go
View file

@ -412,12 +412,9 @@ func (d *Database) StoreEvent(
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
// We've already inserted the event so select the numeric event ID // We've already inserted the event so select the numeric event ID
eventNID, stateNID, err = d.EventsTable.SelectEvent(ctx, txn, event.EventID()) eventNID, stateNID, err = d.EventsTable.SelectEvent(ctx, txn, event.EventID())
if err != nil {
return fmt.Errorf("d.EventsTable.SelectEvent: %w", err)
}
} }
if err != nil { if err != nil {
return fmt.Errorf("d.EventsTable.InsertEvent: %w", err) return err
} }
} }