svn commit: r1379591 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java

[markt]

Author: markt
Date: Fri Aug 31 20:34:44 2012
New Revision: 1379591

URL: http://svn.apache.org/viewvc?rev=1379591&view=rev
Log:
Remove unnecessary method calls. The Resolvers manage this flag.

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:r1379590

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=1379591&r1=1379590&r2=1379591&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 Fri Aug 31 
20:34:44 2012
@@ -80,7 +80,6 @@ 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(
@@ -118,7 +117,6 @@ 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;
 
@@ -134,7 +132,6 @@ public final class AstValue extends Simp
 
             } else {
                 // Object with property at end of expression
-                ctx.setPropertyResolved(false);
                 property = this.children[i].getValue(ctx);
                 i++;
 
@@ -178,7 +175,6 @@ public final class AstValue extends Simp
                     return null;
                 }
                 
-                ctx.setPropertyResolved(false);
                 base = resolver.getValue(ctx, base, suffix);
                 i++;
             }
@@ -193,7 +189,6 @@ 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()) {
@@ -207,7 +202,6 @@ 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org