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 2019/11/02 12:18:23 UTC
[tomcat] branch 8.5.x updated: Polish. Improve alignment with
9.0.x/7.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6b2bb06 Polish. Improve alignment with 9.0.x/7.0.x
6b2bb06 is described below
commit 6b2bb06d4b6d6219b5cf80f4275cb8e7e04b42e9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Nov 2 12:16:34 2019 +0000
Polish. Improve alignment with 9.0.x/7.0.x
---
java/org/apache/catalina/startup/ContextConfig.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 39ca690..fb87502 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1681,6 +1681,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.
@@ -1751,6 +1752,7 @@ public class ContextConfig implements LifecycleListener {
context.getCatalinaBase().getPath());
}
+
/**
* Identify the host web.xml to be used and obtain an input source for
* it.
@@ -1902,6 +1904,7 @@ public class ContextConfig implements LifecycleListener {
// validation is not enabled
parseRequired = false;
}
+
FragmentJarScannerCallback callback =
new FragmentJarScannerCallback(webXmlParser, delegate, parseRequired);
@@ -2560,7 +2563,7 @@ public class ContextConfig implements LifecycleListener {
}
protected String[] processAnnotationsStringArray(ElementValue ev) {
- ArrayList<String> values = new ArrayList<>();
+ List<String> values = new ArrayList<>();
if (ev instanceof ArrayElementValue) {
ElementValue[] arrayValues =
((ArrayElementValue) ev).getElementValuesArray();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org