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 7bd3b3d Fix NPE reported by CI system
7bd3b3d is described below
commit 7bd3b3d8dd2e9522199e6d0db7d717862a8b2a36
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 dc580d5..0d0bc7a 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
