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

(-)java/org/apache/catalina/loader/WebappClassLoader.java (-1 / +5 lines)
Lines 188-194 Link Here
188
     * earlier versions.
188
     * earlier versions.
189
     */
189
     */
190
    protected static final String[] triggers = {
190
    protected static final String[] triggers = {
191
        "javax.servlet.Servlet"                     // Servlet API
191
        "javax.servlet.Servlet", "javax.el.Expression"       // Servlet API
192
    };
192
    };
193
193
194
194
Lines 3280-3285 Link Here
3280
            // Web apps should never package any other Servlet or JSP classes
3280
            // Web apps should never package any other Servlet or JSP classes
3281
            return false;
3281
            return false;
3282
        }
3282
        }
3283
        if (name.startsWith("javax.el")) {
3284
            // Must never load javax.el.* classes
3285
            return false;
3286
        }
3283
3287
3284
        // Assume everything else is OK
3288
        // Assume everything else is OK
3285
        return true;
3289
        return true;

Return to bug 52245