From 5348b64edc01ea23739e4b88d23fd652e49c361f Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 18 May 2017 10:17:11 +0200 Subject: [PATCH] mediaapi/writers/download: Reduce complexity of copyToActiveAndPassive --- .../matrix-org/dendrite/mediaapi/writers/download.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go b/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go index 83ea70225..ac8aaff01 100644 --- a/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go +++ b/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go @@ -297,7 +297,10 @@ func copyToActiveAndPassive(r io.Reader, wActive io.Writer, wPassive io.Writer, break } bytesResponded += int64(bytesTemp) - if copyError == nil || (copyError != errFileIsTooLarge && copyError != errWrite) { + if copyError == nil { + // Note: if we get here then copyError != errFileIsTooLarge && copyError != errWrite + // as if copyError == errResponse || copyError == errWrite then we would have broken + // out of the loop and there are no other cases // if larger than maxFileSize then stop writing to disk and discard cached file if bytesWritten+int64(len(buffer)) > int64(maxFileSize) { copyError = errFileIsTooLarge