Author: markt
Date: Fri Oct 26 22:23:28 2012
New Revision: 1402705
URL: http://svn.apache.org/viewvc?rev=1402705&view=rev
Log:
No need for wrapper as functionMap extends java.el.FunctionMapper
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1402705&r1=1402704&r2=1402705&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Fri Oct 26
22:23:28 2012
@@ -49,7 +49,6 @@ import javax.servlet.jsp.tagext.BodyCont
import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.el.ELContextImpl;
-import org.apache.jasper.el.FunctionMapperImpl;
import org.apache.jasper.security.SecurityUtil;
/**
@@ -956,7 +955,7 @@ public class PageContextImpl extends Pag
@Override
public Object run() throws Exception {
ELContextImpl ctx = (ELContextImpl)
pageContext.getELContext();
- ctx.setFunctionMapper(new
FunctionMapperImpl(functionMap));
+ ctx.setFunctionMapper(functionMap);
ValueExpression ve =
exprFactory.createValueExpression(ctx, expression, expectedType);
return ve.getValue(ctx);
}
@@ -971,7 +970,7 @@ public class PageContextImpl extends Pag
}
} else {
ELContextImpl ctx = (ELContextImpl) pageContext.getELContext();
- ctx.setFunctionMapper(new FunctionMapperImpl(functionMap));
+ ctx.setFunctionMapper(functionMap);
ValueExpression ve = exprFactory.createValueExpression(ctx,
expression, expectedType);
retValue = ve.getValue(ctx);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
