Fix JSP availability check when not running as a packaged war

See gh-12859

Fix JSP availability check when not running as a packaged war
See gh-12859
82465cf4 · Mandap · Andy Wilkinson · b35e1ad2 · 82465cf4
Commit 82465cf4 authored Apr 13, 2018 by Mandap Committed by Andy Wilkinson Jun 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

JspTemplateAvailabilityProvider.java ...ot/autoconfigure/web/JspTemplateAvailabilityProvider.java +2 -1

No files found.
--- 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;
 	}