From 24fd4a1c7fba2175582151ec00c652ea88137c8d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 24 Feb 2015 13:34:45 -0800 Subject: [PATCH] Relax MultipartConfigElement condition Allow MultipartConfigElement bean to be created even if a MultipartResolver bean has been defined by the user. Fixes gh-2538 --- .../boot/autoconfigure/web/MultipartAutoConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java index f1eb822806b..3ca7ce2346b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java @@ -56,8 +56,7 @@ public class MultipartAutoConfiguration { private MultipartProperties multipartProperties = new MultipartProperties(); @Bean - @ConditionalOnMissingBean(value = { MultipartConfigElement.class, - MultipartResolver.class }) + @ConditionalOnMissingBean public MultipartConfigElement multipartConfigElement() { return this.multipartProperties.createMultipartConfig(); }