Skip to content

S
spring-boot
Commit 82465cf4 authored by Mandap's avatar Mandap Committed by Andy Wilkinson
Browse files
Options

Fix JSP availability check when not running as a packaged war 

See gh-12859
parent b35e1ad2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java
View file @ 82465cf4
...@@ -38,7 +38,8 @@ public class JspTemplateAvailabilityProvider implements TemplateAvailabilityProv ...@@ -38,7 +38,8 @@ public class JspTemplateAvailabilityProvider implements TemplateAvailabilityProv
ClassLoader classLoader, ResourceLoader resourceLoader) { ClassLoader classLoader, ResourceLoader resourceLoader) {
if (ClassUtils.isPresent("org.apache.jasper.compiler.JspConfig", classLoader)) { if (ClassUtils.isPresent("org.apache.jasper.compiler.JspConfig", classLoader)) {
String resourceName = getResourceName(view, environment); 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; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment