char/dendrite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mediaapi/writers/download: Wrap broadcast call in closure to re-evaluate args

Browse source
This commit is contained in:
Robert Swain 2017-06-01 14:44:00 +02:00
parent 4457ebddca
commit ce21b32d38
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
View file

@ -226,9 +226,11 @@ func (r *downloadRequest) getRemoteFile(cfg *config.MediaAPI, db *storage.Databa
r.MediaMetadata = mediaMetadata
} else {
// Note: This is an active request that MUST broadcastMediaMetadata to wake up waiting goroutines!
// Note: errorResponse is the named return variable
// Note: broadcastMediaMetadata uses mutexes and conditions from activeRemoteRequests
defer r.broadcastMediaMetadata(activeRemoteRequests, errorResponse)
defer func() {
// Note: errorResponse is the named return variable so we wrap this in a closure to re-evaluate the arguments at defer-time
r.broadcastMediaMetadata(activeRemoteRequests, errorResponse)
}()
// check if we have a record of the media in our database
mediaMetadata, err := db.GetMediaMetadata(r.MediaMetadata.MediaID, r.MediaMetadata.Origin)