This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7c74df7e3896609a5409bc5a2e110b685b3ca09b Author: Mark Thomas <ma...@apache.org> AuthorDate: Sat Nov 2 12:16:06 2019 +0000 Polish. Improve alignment with 8.5.x/7.0.x --- java/org/apache/catalina/startup/ContextConfig.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 8b2446d..c35c354 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -1718,6 +1718,7 @@ public class ContextConfig implements LifecycleListener { } } + /** * Scan JARs that contain web-fragment.xml files that will be used to * configure this application to see if they also contain static resources. @@ -1787,6 +1788,7 @@ public class ContextConfig implements LifecycleListener { return getWebXmlSource(defaultWebXml, true); } + /** * Identify the host web.xml to be used and obtain an input source for * it. @@ -1959,6 +1961,7 @@ public class ContextConfig implements LifecycleListener { // validation is not enabled parseRequired = false; } + FragmentJarScannerCallback callback = new FragmentJarScannerCallback(webXmlParser, delegate, parseRequired); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org