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

Update ErrorMvcAutoConfiguration for Spring 4 

Update ErrorMvcAutoConfiguration thymeleaf condition to use the
`spring4` package.

Fixes gh-310
This commit is contained in:
Phillip Webb 2014-02-04 12:29:40 -08:00
parent 69f7f38403
commit 31c385470e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
View File

@ -115,10 +115,11 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
} }
private static class ErrorTemplateMissingCondition extends SpringBootCondition { private static class ErrorTemplateMissingCondition extends SpringBootCondition {
@Override @Override
public ConditionOutcome getMatchOutcome(ConditionContext context, public ConditionOutcome getMatchOutcome(ConditionContext context,
AnnotatedTypeMetadata metadata) { AnnotatedTypeMetadata metadata) {
if (ClassUtils.isPresent("org.thymeleaf.spring3.SpringTemplateEngine", if (ClassUtils.isPresent("org.thymeleaf.spring4.SpringTemplateEngine",
context.getClassLoader())) { context.getClassLoader())) {
if (DefaultTemplateResolverConfiguration.templateExists( if (DefaultTemplateResolverConfiguration.templateExists(
context.getEnvironment(), context.getResourceLoader(), "error")) { context.getEnvironment(), context.getResourceLoader(), "error")) {
@ -135,6 +136,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
} }
return ConditionOutcome.match("no error template view detected"); return ConditionOutcome.match("no error template view detected");
}; };
} }
private static class SpelView implements View { private static class SpelView implements View {