From dev-return-202982-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Sat Nov 2 12:18:27 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1E32B180661 for ; Sat, 2 Nov 2019 13:18:27 +0100 (CET) Received: (qmail 5464 invoked by uid 500); 2 Nov 2019 12:18:24 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 5412 invoked by uid 99); 2 Nov 2019 12:18:23 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Nov 2019 12:18:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CF345805E6; Sat, 2 Nov 2019 12:18:23 +0000 (UTC) Date: Sat, 02 Nov 2019 12:18:23 +0000 To: "dev@tomcat.apache.org" Subject: [tomcat] branch 8.5.x updated: Polish. Improve alignment with 9.0.x/7.0.x MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157269710375.16081.14373111411642783371@gitbox.apache.org> From: markt@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: tomcat X-Git-Refname: refs/heads/8.5.x X-Git-Reftype: branch X-Git-Oldrev: ce6a3c91402ea088fb2ce64ee34e4b92f3dbfa5f X-Git-Newrev: 6b2bb06d4b6d6219b5cf80f4275cb8e7e04b42e9 X-Git-Rev: 6b2bb06d4b6d6219b5cf80f4275cb8e7e04b42e9 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 values = new ArrayList<>(); + List 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