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

mediaapi/writers/download: Remove unnecesary Unlock, Lock after Cond.Wait

Browse source
This commit is contained in:
Robert Swain 2017-06-01 08:39:35 +02:00
parent 923013aa55
commit a3b1c7535a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -253,10 +253,8 @@ func (r *downloadRequest) getMediaMetadataForRemoteFile(db *storage.Database, ac
if activeRemoteRequestResult, ok := activeRemoteRequests.MXCToResult[mxcURL]; ok {
r.Logger.Info("Waiting for another goroutine to fetch the remote file.")
// NOTE: Wait unlocks and locks again internally. There is still a deferred Unlock() that will unlock this.
activeRemoteRequestResult.Cond.Wait()
activeRemoteRequests.Unlock()
// NOTE: there is still a deferred Unlock() that will unlock this
activeRemoteRequests.Lock()
// check if we have a record of the media in our database
mediaMetadata, err := db.GetMediaMetadata(r.MediaMetadata.MediaID, r.MediaMetadata.Origin)