Author: markt
Date: Sat Sep 1 10:25:21 2012
New Revision: 1379736
URL: http://svn.apache.org/viewvc?rev=1379736&view=rev
Log:
Revert r1379591
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1379733
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java?rev=1379736&r1=1379735&r2=1379736&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java Sat Sep 1
10:25:21 2012
@@ -80,6 +80,7 @@ public final class AstValue extends Simp
@Override
public Class<?> getType(EvaluationContext ctx) throws ELException {
Target t = getTarget(ctx);
+ ctx.setPropertyResolved(false);
Class<?> result = ctx.getELResolver().getType(ctx, t.base, t.property);
if (!ctx.isPropertyResolved()) {
throw new PropertyNotFoundException(MessageFactory.get(
@@ -117,6 +118,7 @@ public final class AstValue extends Simp
} else if (i + 2 == propCount &&
this.children[i + 1] instanceof AstMethodParameters) {
// Method call at end of expression
+ ctx.setPropertyResolved(false);
property = this.children[i].getValue(ctx);
i += 2;
@@ -132,6 +134,7 @@ public final class AstValue extends Simp
} else {
// Object with property at end of expression
+ ctx.setPropertyResolved(false);
property = this.children[i].getValue(ctx);
i++;
@@ -175,6 +178,7 @@ public final class AstValue extends Simp
return null;
}
+ ctx.setPropertyResolved(false);
base = resolver.getValue(ctx, base, suffix);
i++;
}
@@ -189,6 +193,7 @@ public final class AstValue extends Simp
@Override
public boolean isReadOnly(EvaluationContext ctx) throws ELException {
Target t = getTarget(ctx);
+ ctx.setPropertyResolved(false);
boolean result =
ctx.getELResolver().isReadOnly(ctx, t.base, t.property);
if (!ctx.isPropertyResolved()) {
@@ -202,6 +207,7 @@ public final class AstValue extends Simp
public void setValue(EvaluationContext ctx, Object value)
throws ELException {
Target t = getTarget(ctx);
+ ctx.setPropertyResolved(false);
ELResolver resolver = ctx.getELResolver();
// coerce to the expected type
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
