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 983d5cc Simplify
983d5cc is described below
commit 983d5ccd2692b29d8f587f8819137bcfebb7e404
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jan 16 11:47:11 2020 +0000
Simplify
---
java/org/apache/catalina/startup/WebappServiceLoader.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/startup/WebappServiceLoader.java
b/java/org/apache/catalina/startup/WebappServiceLoader.java
index d6b7623..dc580d5 100644
--- a/java/org/apache/catalina/startup/WebappServiceLoader.java
+++ b/java/org/apache/catalina/startup/WebappServiceLoader.java
@@ -96,8 +96,6 @@ public class WebappServiceLoader<T> {
LinkedHashSet<String> applicationServicesFound = new LinkedHashSet<>();
LinkedHashSet<String> containerServicesFound = new LinkedHashSet<>();
- ClassLoader loader = servletContext.getClassLoader();
-
// if the ServletContext has ORDERED_LIBS, then use that to specify the
// set of JARs from WEB-INF/lib that should be used for loading
services
@SuppressWarnings("unchecked")
@@ -141,7 +139,7 @@ public class WebappServiceLoader<T> {
}
// and use the parent ClassLoader for all other SCIs
- loader = context.getParentClassLoader();
+ ClassLoader loader = context.getParentClassLoader();
Enumeration<URL> resources;
if (loader == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
