From 390b5e7b7ebb3649b7d2250f31223b8137273e68 Mon Sep 17 00:00:00 2001 From: konradend Date: Thu, 28 May 2020 10:17:17 +0400 Subject: [PATCH] DATAMONGO-2574 - Do not overwrite contentType for GridFsFile. Original Pull Request: #868 --- .../data/mongodb/gridfs/GridFsOperations.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java index 502d21098..8337cc671 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java @@ -140,12 +140,12 @@ public interface GridFsOperations extends ResourcePatternResolver { if (StringUtils.hasText(filename)) { uploadBuilder.filename(filename); } - if (StringUtils.hasText(contentType)) { - uploadBuilder.contentType(contentType); - } if (!ObjectUtils.isEmpty(metadata)) { uploadBuilder.metadata(metadata); } + if (StringUtils.hasText(contentType)) { + uploadBuilder.contentType(contentType); + } return store(uploadBuilder.build()); }