You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/11 20:59:58 UTC
svn commit: r1659053 - /tomcat/trunk/java/org/apache/jasper/JspC.java
Author: markt
Date: Wed Feb 11 19:59:58 2015
New Revision: 1659053
URL: http://svn.apache.org/r1659053
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57564
Make JspC amenable to sub-classing
Patch provided by Jan Bartel
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1659053&r1=1659052&r2=1659053&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Wed Feb 11 19:59:58 2015
@@ -252,6 +252,8 @@ public class JspC extends Task implement
protected JspConfig jspConfig = null;
protected TagPluginManager tagPluginManager = null;
+ protected TldScanner scanner = null;
+
protected boolean verbose = false;
protected boolean listErrors = false;
protected boolean showSuccess = false;
@@ -1461,6 +1463,23 @@ public class JspC extends Task implement
}
}
+
+ protected void initTldScanner(JspCServletContext context, ClassLoader classLoader) {
+ if (scanner != null) {
+ return;
+ }
+
+ scanner = newTldScanner(context, true, isValidateTld(), isBlockExternal());
+ scanner.setClassLoader(classLoader);
+ }
+
+
+ protected TldScanner newTldScanner(JspCServletContext context, boolean namespaceAware,
+ boolean validate, boolean blockExternal) {
+ return new TldScanner(context, namespaceAware, validate, blockExternal);
+ }
+
+
protected void initServletContext(ClassLoader classLoader)
throws IOException, JasperException {
// TODO: should we use the Ant Project's log?
@@ -1473,9 +1492,8 @@ public class JspC extends Task implement
context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM, "true");
}
- TldScanner scanner = new TldScanner(
- context, true, isValidateTld(), isBlockExternal());
- scanner.setClassLoader(classLoader);
+
+ initTldScanner(context, classLoader);
try {
scanner.scan();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org