Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revised checkResource implementation

Browse Source 
Issue: SPR-14729
(cherry picked from commit ca17edd)
This commit is contained in:
Juergen Hoeller
2016-09-18 21:04:37 +02:00
parent 9e5435e6f2
commit f532de92aa
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
View File

@@ -16,7 +16,6 @@
package org.springframework.web.servlet.view.script;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
@@ -194,19 +193,6 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
}
}
@Override
public boolean checkResource(Locale locale) throws Exception {
try {
getTemplate(getUrl());
return true;
}
catch (IllegalStateException exc) {
if (logger.isDebugEnabled()) {
logger.debug("No ScriptTemplate view found for URL: " + getUrl());
}
return false;
}
}
@Override
protected void initApplicationContext(ApplicationContext context) {
@@ -265,7 +251,6 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
Assert.isTrue(this.renderFunction != null, "The 'renderFunction' property must be defined.");
}
protected ScriptEngine getEngine() {
if (Boolean.FALSE.equals(this.sharedEngine)) {
Map<Object, ScriptEngine> engines = enginesHolder.get();
@@ -300,14 +285,17 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
protected void loadScripts(ScriptEngine engine) {
if (!ObjectUtils.isEmpty(this.scripts)) {
try {
for (String script : this.scripts) {
Resource resource = getResource(script);
for (String script : this.scripts) {
Resource resource = getResource(script);
if (resource == null) {
throw new IllegalStateException("Script resource [" + script + "] not found");
}
try {
engine.eval(new InputStreamReader(resource.getInputStream()));
}
}
catch (Exception ex) {
throw new IllegalStateException("Failed to load script", ex);
catch (Throwable ex) {
throw new IllegalStateException("Failed to evaluate script [" + script + "]", ex);
}
}
}
}
@@ -319,7 +307,7 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
return resource;
}
}
throw new IllegalStateException("Resource [" + location + "] not found");
return null;
}
protected ScriptTemplateConfig autodetectViewConfig() throws BeansException {
@@ -334,6 +322,12 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
}
}
@Override
public boolean checkResource(Locale locale) throws Exception {
return (getResource(getUrl()) != null);
}
@Override
protected void prepareResponse(HttpServletRequest request, HttpServletResponse response) {
super.prepareResponse(request, response);
@@ -370,6 +364,9 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
protected String getTemplate(String path) throws IOException {
Resource resource = getResource(path);
if (resource == null) {
throw new IllegalStateException("Template resource [" + path + "] not found");
}
InputStreamReader reader = new InputStreamReader(resource.getInputStream(), this.charset);
return FileCopyUtils.copyToString(reader);
}