Commit 24fd4a1c authored by Phillip Webb's avatar Phillip Webb

Relax MultipartConfigElement condition

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

Fixes gh-2538
parent 4cac9d73
...@@ -56,8 +56,7 @@ public class MultipartAutoConfiguration { ...@@ -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();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment