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

SPR-6923 SpEL resolving nested property as outer object

This commit is contained in:
Scott Andrews 2010-03-10 17:44:14 +00:00
parent af4b22e5b9
commit 50c5593740
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ public class EvalTag extends HtmlEscapingAwareTag {
} }
public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
return (resolveImplicitVariable(name) != null || this.pageContext.findAttribute(name) != null); return target == null && (resolveImplicitVariable(name) != null || this.pageContext.findAttribute(name) != null);
} }
public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {

14
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
View File

@ -90,6 +90,17 @@ public class EvalTagTests extends AbstractTagTests {
assertEquals(new BigDecimal(".25"), context.getAttribute("foo")); assertEquals(new BigDecimal(".25"), context.getAttribute("foo"));
} }
// SPR-6923
public void testNestedPropertyWithAttribtueName() throws Exception {
tag.setExpression("bean.bean");
tag.setVar("foo");
int action = tag.doStartTag();
assertEquals(Tag.EVAL_BODY_INCLUDE, action);
action = tag.doEndTag();
assertEquals(Tag.EVAL_PAGE, action);
assertEquals("not the bean object", context.getAttribute("foo"));
}
public static class Bean { public static class Bean {
public String method() { public String method() {
@ -104,6 +115,9 @@ public class EvalTagTests extends AbstractTagTests {
public String html() { public String html() {
return "<p>"; return "<p>";
} }
public String getBean() {
return "not the bean object";
}
public String js() { public String js() {
return "function foo() { alert(\"hi\") }"; return "function foo() { alert(\"hi\") }";