--- org/apache/jasper/runtime/JspApplicationContextImpl.java (revision 1370136) +++ org/apache/jasper/runtime/JspApplicationContextImpl.java (working copy) @@ -19,26 +19,18 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; import javax.el.ELContextEvent; import javax.el.ELContextListener; import javax.el.ELResolver; import javax.el.ExpressionFactory; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.ResourceBundleELResolver; import javax.servlet.ServletContext; import javax.servlet.jsp.JspApplicationContext; import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.el.ImplicitObjectELResolver; -import javax.servlet.jsp.el.ScopedAttributeELResolver; import org.apache.jasper.Constants; +import org.apache.jasper.el.CustomizedELResolver; import org.apache.jasper.el.ELContextImpl; /** @@ -119,19 +111,9 @@ private ELResolver createELResolver() { this.instantiated = true; if (this.resolver == null) { - CompositeELResolver r = new CompositeELResolver(); - r.add(new ImplicitObjectELResolver()); - for (Iterator itr = this.resolvers.iterator(); - itr.hasNext();) { - r.add(itr.next()); - } - r.add(new MapELResolver()); - r.add(new ResourceBundleELResolver()); - r.add(new ListELResolver()); - r.add(new ArrayELResolver()); - r.add(new BeanELResolver()); - r.add(new ScopedAttributeELResolver()); - this.resolver = r; + CustomizedELResolver r = new CustomizedELResolver(); + r.addResolvers(resolvers); + this.resolver = r; } return this.resolver; }