Commit 9d609ab1 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #15778 from ayudovin

* pr/15778:
  Polish "Handle AccessControlException in JspTemplateAvailabilityProvider"
  Handle AccessControlException in JspTemplateAvailabilityProvider
parents 66f60fbb c5675de6
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.boot.autoconfigure.web.servlet; package org.springframework.boot.autoconfigure.web.servlet;
import java.io.File; import java.io.File;
import java.security.AccessControlException;
import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
...@@ -42,8 +43,12 @@ public class JspTemplateAvailabilityProvider implements TemplateAvailabilityProv ...@@ -42,8 +43,12 @@ public class JspTemplateAvailabilityProvider implements TemplateAvailabilityProv
if (resourceLoader.getResource(resourceName).exists()) { if (resourceLoader.getResource(resourceName).exists()) {
return true; return true;
} }
try {
return new File("src/main/webapp", resourceName).exists(); return new File("src/main/webapp", resourceName).exists();
} }
catch (AccessControlException ex) {
}
}
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