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
The following commit(s) were added to refs/heads/master by this push: new 24713fa Fix NPE reported by CI system 24713fa is described below commit 24713fab3d5f35d86f709f40c29a65d528edab4c Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Jan 16 14:16:44 2020 +0000 Fix NPE reported by CI system --- java/org/apache/catalina/startup/WebappServiceLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/startup/WebappServiceLoader.java b/java/org/apache/catalina/startup/WebappServiceLoader.java index 0b8eab8..bd3bfe5 100644 --- a/java/org/apache/catalina/startup/WebappServiceLoader.java +++ b/java/org/apache/catalina/startup/WebappServiceLoader.java @@ -114,7 +114,9 @@ public class WebappServiceLoader<T> { // Ordered libs so only use services defined in those libs and any // in WEB-INF/classes URL unpacked = servletContext.getResource(CLASSES + configFile); - parseConfigFile(applicationServicesFound, unpacked); + if (unpacked != null) { + parseConfigFile(applicationServicesFound, unpacked); + } for (String lib : orderedLibs) { URL jarUrl = servletContext.getResource(LIB + lib); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org