Author: remy.maucherat(a)jboss.com Date: 2010-03-18 08:51:25 -0400 (Thu, 18 Mar 2010) New Revision: 1414 Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java trunk/java/org/apache/jasper/compiler/PageInfo.java Log: - Use ExpressionFactory.newInstance(). Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspUtil.java 2010-03-17 13:30:11 UTC (rev 1413) +++ trunk/java/org/apache/jasper/compiler/JspUtil.java 2010-03-18 12:51:25 UTC (rev 1414) @@ -27,12 +27,9 @@ import java.util.zip.ZipEntry; import javax.el.FunctionMapper; -import javax.servlet.jsp.el.ExpressionEvaluator; -import org.apache.el.ExpressionFactoryImpl; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; -import org.apache.jasper.el.ExpressionEvaluatorImpl; import org.xml.sax.Attributes; /** @@ -61,8 +58,8 @@ //= new ExpressionEvaluatorImpl(); //tc6 - private final static ExpressionEvaluator expressionEvaluator = - new ExpressionEvaluatorImpl(new ExpressionFactoryImpl()); + //private final static ExpressionEvaluator expressionEvaluator = + // new ExpressionEvaluatorImpl(ExpressionFactory.newInstance()); private static final String javaKeywords[] = { "abstract", "assert", "boolean", "break", "byte", "case", Modified: trunk/java/org/apache/jasper/compiler/PageInfo.java =================================================================== --- trunk/java/org/apache/jasper/compiler/PageInfo.java 2010-03-17 13:30:11 UTC (rev 1413) +++ trunk/java/org/apache/jasper/compiler/PageInfo.java 2010-03-18 12:51:25 UTC (rev 1414) @@ -28,7 +28,6 @@ import javax.el.ExpressionFactory; import javax.servlet.jsp.tagext.TagLibraryInfo; -import org.apache.el.ExpressionFactoryImpl; import org.apache.jasper.Constants; import org.apache.jasper.JasperException; @@ -77,7 +76,7 @@ // JSP 2.1 private String deferredSyntaxAllowedAsLiteralValue; private boolean deferredSyntaxAllowedAsLiteral = false; - private ExpressionFactory expressionFactory = new ExpressionFactoryImpl(); + private ExpressionFactory expressionFactory = ExpressionFactory.newInstance(); private String trimDirectiveWhitespacesValue; private boolean trimDirectiveWhitespaces = false;