root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Defensive on startup with Multipart config

This commit is contained in:
Dave Syer 2014-06-02 22:30:01 +01:00
parent 1f82ef4deb
commit 77eaa9b24e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View File

@ -346,7 +346,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
}
});
}
catch (Exception ex) {
catch (Throwable ex) {
// swallow exception and continue
}
}

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

@ -44,7 +44,8 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve
* @author Josh Long
*/
@Configuration
@ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class })
@ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class,
MultipartConfigElement.class })
@ConditionalOnExpression("${multipart.enabled:true}")
@EnableConfigurationProperties(MultipartProperties.class)
public class MultipartAutoConfiguration {