View | Details | Raw Unified | Return to bug 53897
Collapse All | Expand All

(-)org/apache/jasper/runtime/JspApplicationContextImpl.java (-22 / +4 lines)
Lines 19-44 Link Here
19
import java.security.AccessController;
19
import java.security.AccessController;
20
import java.security.PrivilegedAction;
20
import java.security.PrivilegedAction;
21
import java.util.ArrayList;
21
import java.util.ArrayList;
22
import java.util.Iterator;
23
import java.util.List;
22
import java.util.List;
24
23
25
import javax.el.ArrayELResolver;
26
import javax.el.BeanELResolver;
27
import javax.el.CompositeELResolver;
28
import javax.el.ELContextEvent;
24
import javax.el.ELContextEvent;
29
import javax.el.ELContextListener;
25
import javax.el.ELContextListener;
30
import javax.el.ELResolver;
26
import javax.el.ELResolver;
31
import javax.el.ExpressionFactory;
27
import javax.el.ExpressionFactory;
32
import javax.el.ListELResolver;
33
import javax.el.MapELResolver;
34
import javax.el.ResourceBundleELResolver;
35
import javax.servlet.ServletContext;
28
import javax.servlet.ServletContext;
36
import javax.servlet.jsp.JspApplicationContext;
29
import javax.servlet.jsp.JspApplicationContext;
37
import javax.servlet.jsp.JspContext;
30
import javax.servlet.jsp.JspContext;
38
import javax.servlet.jsp.el.ImplicitObjectELResolver;
39
import javax.servlet.jsp.el.ScopedAttributeELResolver;
40
31
41
import org.apache.jasper.Constants;
32
import org.apache.jasper.Constants;
33
import org.apache.jasper.el.CustomizedELResolver;
42
import org.apache.jasper.el.ELContextImpl;
34
import org.apache.jasper.el.ELContextImpl;
43
35
44
/**
36
/**
Lines 119-137 Link Here
119
    private ELResolver createELResolver() {
111
    private ELResolver createELResolver() {
120
        this.instantiated = true;
112
        this.instantiated = true;
121
        if (this.resolver == null) {
113
        if (this.resolver == null) {
122
            CompositeELResolver r = new CompositeELResolver();
114
        	CustomizedELResolver r = new CustomizedELResolver();	
123
            r.add(new ImplicitObjectELResolver());
115
			r.addResolvers(resolvers);
124
            for (Iterator<ELResolver> itr = this.resolvers.iterator();
116
			this.resolver = r;
125
                    itr.hasNext();) {
126
                r.add(itr.next());
127
            }
128
            r.add(new MapELResolver());
129
            r.add(new ResourceBundleELResolver());
130
            r.add(new ListELResolver());
131
            r.add(new ArrayELResolver());    
132
            r.add(new BeanELResolver());
133
            r.add(new ScopedAttributeELResolver());
134
            this.resolver = r;
135
        }
117
        }
136
        return this.resolver;
118
        return this.resolver;
137
    }
119
    }

Return to bug 53897