root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed EvalTag's EvaluationContext caching (SPR-7482)

This commit is contained in:
Juergen Hoeller 2010-09-01 13:33:45 +00:00
parent 3e5aca86d5
commit 5ddf8245dd
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
View File

@ -48,9 +48,15 @@ import org.springframework.web.util.TagUtils;
*/
public class EvalTag extends HtmlEscapingAwareTag {
private final ExpressionParser expressionParser = new SpelExpressionParser();
/**
* {@link javax.servlet.jsp.PageContext} attribute for the
* page-level {@link EvaluationContext} instance.
*/
private static final String EVALUATION_CONTEXT_PAGE_ATTRIBUTE =
"org.springframework.web.servlet.tags.EVALUATION_CONTEXT";
private EvaluationContext evaluationContext;
private final ExpressionParser expressionParser = new SpelExpressionParser();
private Expression expression;
@ -101,20 +107,23 @@ public class EvalTag extends HtmlEscapingAwareTag {
@Override
public int doEndTag() throws JspException {
if (this.evaluationContext == null) {
this.evaluationContext = createEvaluationContext(pageContext);
EvaluationContext evaluationContext =
(EvaluationContext) this.pageContext.getAttribute(EVALUATION_CONTEXT_PAGE_ATTRIBUTE);
if (evaluationContext == null) {
evaluationContext = createEvaluationContext(this.pageContext);
this.pageContext.setAttribute(EVALUATION_CONTEXT_PAGE_ATTRIBUTE, evaluationContext);
}
if (this.var != null) {
Object result = this.expression.getValue(this.evaluationContext);
pageContext.setAttribute(this.var, result, this.scope);
Object result = this.expression.getValue(evaluationContext);
this.pageContext.setAttribute(this.var, result, this.scope);
}
else {
try {
String result = this.expression.getValue(this.evaluationContext, String.class);
String result = this.expression.getValue(evaluationContext, String.class);
result = ObjectUtils.getDisplayString(result);
result = (isHtmlEscape() ? HtmlUtils.htmlEscape(result) : result);
result = (this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(result) : result);
pageContext.getOut().print(result);
this.pageContext.getOut().print(result);
}
catch (IOException ex) {
throw new JspException(ex);

6
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
View File

@ -48,8 +48,8 @@ import org.springframework.web.servlet.support.RequestContext;
public abstract class RequestContextAwareTag extends TagSupport implements TryCatchFinally {
/**
* {@link javax.servlet.jsp.PageContext} attribute for page-level
* {@link RequestContext} instance.
* {@link javax.servlet.jsp.PageContext} attribute for the
* page-level {@link RequestContext} instance.
*/
public static final String REQUEST_CONTEXT_PAGE_ATTRIBUTE =
"org.springframework.web.servlet.tags.REQUEST_CONTEXT";
@ -70,8 +70,8 @@ public abstract class RequestContextAwareTag extends TagSupport implements TryCa
*/
@Override
public final int doStartTag() throws JspException {
this.requestContext = (RequestContext) this.pageContext.getAttribute(REQUEST_CONTEXT_PAGE_ATTRIBUTE);
try {
this.requestContext = (RequestContext) this.pageContext.getAttribute(REQUEST_CONTEXT_PAGE_ATTRIBUTE);
if (this.requestContext == null) {
this.requestContext = new JspAwareRequestContext(this.pageContext);
this.pageContext.setAttribute(REQUEST_CONTEXT_PAGE_ATTRIBUTE, this.requestContext);