This is an automated email from the ASF dual-hosted git repository.
fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 77efc02 Parent classloader has to be resolved first.
77efc02 is described below
commit 77efc025aca11e63d40dd758538a436c18edf96f
Author: Filip Hanik <[email protected]>
AuthorDate: Tue Jul 21 16:18:09 2020 -0700
Parent classloader has to be resolved first.
missing commit.
---
java/org/apache/catalina/loader/WebappLoader.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index 0dc64ed..95d70c2 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -507,6 +507,12 @@ public class WebappLoader extends LifecycleMBeanBase
private WebappClassLoaderBase createClassLoader()
throws Exception {
+ if (parentClassLoader == null) {
+ parentClassLoader = context.getParentClassLoader();
+ } else {
+ context.setParentClassLoader(parentClassLoader);
+ }
+
if (ParallelWebappClassLoader.class.getName().equals(loaderClass)) {
return new ParallelWebappClassLoader(parentClassLoader);
}
@@ -514,11 +520,6 @@ public class WebappLoader extends LifecycleMBeanBase
Class<?> clazz = Class.forName(loaderClass);
WebappClassLoaderBase classLoader = null;
- if (parentClassLoader == null) {
- parentClassLoader = context.getParentClassLoader();
- } else {
- context.setParentClassLoader(parentClassLoader);
- }
Class<?>[] argTypes = { ClassLoader.class };
Object[] args = { parentClassLoader };
Constructor<?> constr = clazz.getConstructor(argTypes);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
