Browse Source

Relax MultipartConfigElement condition

Allow MultipartConfigElement bean to be created even if a
MultipartResolver bean has been defined by the user.

Fixes gh-2538
pull/2479/merge
Phillip Webb 11 years ago
parent
commit
24fd4a1c7f
  1. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java

3
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(); private MultipartProperties multipartProperties = new MultipartProperties();
@Bean @Bean
@ConditionalOnMissingBean(value = { MultipartConfigElement.class, @ConditionalOnMissingBean
MultipartResolver.class })
public MultipartConfigElement multipartConfigElement() { public MultipartConfigElement multipartConfigElement() {
return this.multipartProperties.createMultipartConfig(); return this.multipartProperties.createMultipartConfig();
} }

Loading…
Cancel
Save