← Back to branch summary

~ubuntu-branches/ubuntu/trusty/tomcat7/trusty-security

« back to all changes in this revision

Viewing changes to java/org/apache/jasper/el/ELContextImpl.java

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2012-06-07 22:43:21 UTC
  • mfrom: (11.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20120607224321-cfev8j681yueyov3
Tags: 7.0.27-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jasper/el/ELContextImpl.java
20
20
import java.util.HashMap;
21
21
import java.util.Map;
22
22
 
 
23
import javax.el.ArrayELResolver;
 
24
import javax.el.BeanELResolver;
 
25
import javax.el.CompositeELResolver;
23
26
import javax.el.ELContext;
24
27
import javax.el.ELResolver;
25
28
import javax.el.FunctionMapper;
 
29
import javax.el.ListELResolver;
 
30
import javax.el.MapELResolver;
 
31
import javax.el.ResourceBundleELResolver;
26
32
import javax.el.ValueExpression;
27
33
import javax.el.VariableMapper;
28
34
 
 
35
import org.apache.jasper.Constants;
 
36
 
29
37
/**
30
38
 * Implementation of ELContext
31
39
 * 
62
70
 
63
71
    }
64
72
 
 
73
    private static final ELResolver DefaultResolver;
 
74
 
 
75
    static {
 
76
        if (Constants.IS_SECURITY_ENABLED) {
 
77
            DefaultResolver = null;
 
78
        } else {
 
79
            DefaultResolver = new CompositeELResolver();
 
80
            ((CompositeELResolver) DefaultResolver).add(new MapELResolver());
 
81
            ((CompositeELResolver) DefaultResolver).add(new ResourceBundleELResolver());
 
82
            ((CompositeELResolver) DefaultResolver).add(new ListELResolver());
 
83
            ((CompositeELResolver) DefaultResolver).add(new ArrayELResolver());
 
84
            ((CompositeELResolver) DefaultResolver).add(new BeanELResolver());
 
85
        }
 
86
    }
 
87
 
65
88
    private final ELResolver resolver;
66
89
 
67
90
    private FunctionMapper functionMapper = NullFunctionMapper;
69
92
    private VariableMapper variableMapper;
70
93
 
71
94
    public ELContextImpl() {
72
 
        this(ELResolverImpl.getDefaultResolver());
 
95
        this(getDefaultResolver());
73
96
    }
74
97
 
75
98
    public ELContextImpl(ELResolver resolver) {
102
125
        this.variableMapper = variableMapper;
103
126
    }
104
127
 
 
128
    public static ELResolver getDefaultResolver() {
 
129
        if (Constants.IS_SECURITY_ENABLED) {
 
130
            CompositeELResolver defaultResolver = new CompositeELResolver();
 
131
            defaultResolver.add(new MapELResolver());
 
132
            defaultResolver.add(new ResourceBundleELResolver());
 
133
            defaultResolver.add(new ListELResolver());
 
134
            defaultResolver.add(new ArrayELResolver());
 
135
            defaultResolver.add(new BeanELResolver());
 
136
            return defaultResolver;
 
137
        } else {
 
138
            return DefaultResolver;
 
139
        }
 
140
    }
105
141
}