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

(-)a/java/org/apache/jasper/JspC.java (-3 / +19 lines)
Lines 252-257 public class JspC extends Task implements Options { Link Here
252
    protected JspConfig jspConfig = null;
252
    protected JspConfig jspConfig = null;
253
    protected TagPluginManager tagPluginManager = null;
253
    protected TagPluginManager tagPluginManager = null;
254
254
255
    protected TldScanner scanner = null;
256
255
    protected boolean verbose = false;
257
    protected boolean verbose = false;
256
    protected boolean listErrors = false;
258
    protected boolean listErrors = false;
257
    protected boolean showSuccess = false;
259
    protected boolean showSuccess = false;
Lines 1461-1466 public class JspC extends Task implements Options { Link Here
1461
        }
1463
        }
1462
    }
1464
    }
1463
1465
1466
1467
    protected void initTldScanner(JspCServletContext context, ClassLoader classLoader) {
1468
        if (scanner != null)
1469
            return;
1470
1471
        scanner = newTldScanner(context, true, isValidateTld(), isBlockExternal());
1472
        scanner.setClassLoader(classLoader);
1473
    }
1474
1475
1476
    protected TldScanner newTldScanner(JspCServletContext context, boolean namespaceAware, boolean validate, boolean blockExternal) {
1477
        return new TldScanner(
1478
                context, namespaceAware, validate, blockExternal);
1479
    }
1480
1464
    protected void initServletContext(ClassLoader classLoader)
1481
    protected void initServletContext(ClassLoader classLoader)
1465
            throws IOException, JasperException {
1482
            throws IOException, JasperException {
1466
        // TODO: should we use the Ant Project's log?
1483
        // TODO: should we use the Ant Project's log?
Lines 1473-1481 public class JspC extends Task implements Options { Link Here
1473
            context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM, "true");
1490
            context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM, "true");
1474
        }
1491
        }
1475
1492
1476
        TldScanner scanner = new TldScanner(
1493
1477
                context, true, isValidateTld(), isBlockExternal());
1494
        initTldScanner(context, classLoader);
1478
        scanner.setClassLoader(classLoader);
1479
1495
1480
        try {
1496
        try {
1481
            scanner.scan();
1497
            scanner.scan();

Return to bug 57564