From 82465cf435d8f31b3246076dffec419141202efa Mon Sep 17 00:00:00 2001 From: Mandap Date: Sat, 14 Apr 2018 02:03:18 +0800 Subject: [PATCH] Fix JSP availability check when not running as a packaged war See gh-12859 --- .../autoconfigure/web/JspTemplateAvailabilityProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java index 2d5166094c..e2088b9553 100755 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java @@ -38,7 +38,8 @@ public class JspTemplateAvailabilityProvider implements TemplateAvailabilityProv ClassLoader classLoader, ResourceLoader resourceLoader) { if (ClassUtils.isPresent("org.apache.jasper.compiler.JspConfig", classLoader)) { String resourceName = getResourceName(view, environment); - return resourceLoader.getResource(resourceName).exists(); + return resourceLoader.getResource(resourceName).exists() || + resourceLoader.getResource("file:./src/main/webapp" + resourceName).exists(); } return false; }