From d5dbdb273703a3add0f1c3287aa531854ab30269 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 3 Nov 2017 10:25:38 -0500 Subject: several one-line panic, race, and logic fixes (#7766) --- utils/file.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/file.go') diff --git a/utils/file.go b/utils/file.go index bc97252ae..c7e092a20 100644 --- a/utils/file.go +++ b/utils/file.go @@ -104,10 +104,10 @@ func ReadFile(path string) ([]byte, *model.AppError) { } bucket := Cfg.FileSettings.AmazonS3Bucket minioObject, err := s3Clnt.GetObject(bucket, path) - defer minioObject.Close() if err != nil { return nil, model.NewAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } + defer minioObject.Close() if f, err := ioutil.ReadAll(minioObject); err != nil { return nil, model.NewAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } else { -- cgit v1.2.3-1-g7c22