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 e94cb97 Optimize the comment about class loader e94cb97 is described below commit e94cb974adff25c9fc3e25755d758033120d3d0a Author: Poison <tianshuang...@gmail.com> AuthorDate: Tue Oct 19 15:51:33 2021 +0800 Optimize the comment about class loader In HotSpot JVM, javaseClassLoader is actually Extension ClassLoader, The comment of javaseClassLoader mentioned: ```java /** * The bootstrap class loader used to load the JavaSE classes. In some * implementations this class loader is always <code>null</code> and in * those cases {@link ClassLoader#getParent()} will be called recursively on * the system class loader and the last non-null result used. */ private ClassLoader javaseClassLoader; ``` So I think it is more appropriate to use bootstrap classLoader in the comments. --- java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java index 16043b5..6a1c618 100644 --- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java +++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java @@ -87,7 +87,7 @@ import org.apache.tomcat.util.security.PermissionCheck; * behavior may be completely different. * <p> * <strong>IMPLEMENTATION NOTE</strong> - By default, this class loader follows - * the delegation model required by the specification. The system class + * the delegation model required by the specification. The bootstrap class * loader will be queried first, then the local repositories, and only then * delegation to the parent class loader will occur. This allows the web * application to override any shared class except the classes from J2SE. @@ -1285,7 +1285,7 @@ public abstract class WebappClassLoaderBase extends URLClassLoader return clazz; } - // (0.2) Try loading the class with the system class loader, to prevent + // (0.2) Try loading the class with the bootstrap class loader, to prevent // the webapp from overriding Java SE classes. This implements // SRV.10.7.2 String resourceName = binaryNameToPath(name, false); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org