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

StandardScriptEvaluator uses same eval exception exposure as ScriptTemplateView

Browse Source 
Issue: SPR-13557
This commit is contained in:
Juergen Hoeller
2015-10-09 22:55:01 +02:00
parent 92dc51f6a8
commit 1d59c5fd41
6 changed files with 89 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,45 +0,0 @@
/*
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.servlet.view.script;
/**
* Exception thrown when an error occurs during script template rendering.
*
* <p>It does not print the java stacktrace in the logs, since it is not useful
* in this script context.
*
* @author Sebastien Deleuze
* @since 4.2.2
*/
public class ScriptRenderException extends RuntimeException {
private static final long serialVersionUID = 421565510962788082L;
/**
* Constructs a new script rendering exception with the specified detail message.
*/
public ScriptRenderException(String msg) {
super(msg);
}
@Override
public synchronized Throwable fillInStackTrace() {
return this;
}
}

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

@@ -29,6 +29,7 @@ import java.util.Map;
import javax.script.Invocable;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,6 +43,7 @@ import org.springframework.core.NamedThreadLocal;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.scripting.support.StandardScriptEvalException;
import org.springframework.scripting.support.StandardScriptUtils;
import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils;
@@ -357,8 +359,8 @@ public class ScriptTemplateView extends AbstractUrlBasedView {
response.getWriter().write(String.valueOf(html));
}
catch (Exception ex) {
throw new ServletException("Failed to render script template", new ScriptRenderException(ex.getMessage()));
catch (ScriptException ex) {
throw new ServletException("Failed to render script template", new StandardScriptEvalException(ex));
}
}