Relax MultipartConfigElement condition

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

Fixes gh-2538
This commit is contained in:
Phillip Webb 2015-02-24 13:34:45 -08:00
parent 4cac9d7382
commit 24fd4a1c7f

View File

@ -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();
}