Author: mbenson
Date: Fri Aug 10 08:53:03 2007
New Revision: 564634
URL: http://svn.apache.org/viewvc?view=rev&rev=564634
Log:
remove unnecessary reference to containing instance from non-static inner
class; suggested by Matthias Ernst
Modified:
commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java
Modified:
commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java?view=diff&rev=564634&r1=564633&r2=564634
==============================================================================
---
commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java
(original)
+++
commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java
Fri Aug 10 08:53:03 2007
@@ -157,7 +157,7 @@
parseExpressionString(expression);
// Create an Expression object that knows how to evaluate this.
- return new JSTLExpression(this, expression, expectedType, fMapper);
+ return new JSTLExpression(expression, expectedType, fMapper);
}
// -------------------------------------
@@ -427,22 +427,20 @@
* the JSTL evaluator.
*/
private class JSTLExpression extends javax.servlet.jsp.el.Expression {
- private ExpressionEvaluatorImpl evaluator;
private String expression;
private Class expectedType;
private FunctionMapper fMapper;
- public JSTLExpression(ExpressionEvaluatorImpl evaluator,
- String expression, Class expectedType, FunctionMapper fMapper)
{
- this.evaluator = evaluator;
+ private JSTLExpression(String expression,
+ Class expectedType, FunctionMapper fMapper) {
this.expression = expression;
this.expectedType = expectedType;
this.fMapper = fMapper;
}
public Object evaluate(VariableResolver vResolver) throws ELException {
- return evaluator.evaluate(this.expression, this.expectedType,
- vResolver, this.fMapper);
+ return ExpressionEvaluatorImpl.this.evaluate(expression,
+ expectedType, vResolver, fMapper);
}
}