Skip to content

Commit 24fd4a1

Browse files
committed
Relax MultipartConfigElement condition
Allow MultipartConfigElement bean to be created even if a MultipartResolver bean has been defined by the user. Fixes gh-2538
1 parent 4cac9d7 commit 24fd4a1

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public class MultipartAutoConfiguration {
5656
private MultipartProperties multipartProperties = new MultipartProperties();
5757

5858
@Bean
59-
@ConditionalOnMissingBean(value = { MultipartConfigElement.class,
60-
MultipartResolver.class })
59+
@ConditionalOnMissingBean
6160
public MultipartConfigElement multipartConfigElement() {
6261
return this.multipartProperties.createMultipartConfig();
6362
}

0 commit comments

Comments
 (0)