This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 43022dd099019a254944874b5984c20135c8b65e Author: Mark Thomas <[email protected]> AuthorDate: Wed May 18 17:08:08 2022 +0100 Improve error message if a required --add-opens option is missing --- .../org/apache/catalina/loader/WebappClassLoaderBase.java | 15 ++++++++++++--- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java index 3376713d6f..b87cc72abe 100644 --- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java +++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java @@ -2025,7 +2025,7 @@ public abstract class WebappClassLoaderBase extends URLClassLoader } } catch (InaccessibleObjectException e) { // Must be running on without the necessary command line options. - log.warn(sm.getString("webappClassLoader.addExportsThreadLocal", this.getClass().getModule().getName())); + log.warn(sm.getString("webappClassLoader.addExportsThreadLocal", getCurrentModuleName())); } catch (Throwable t) { ExceptionUtils.handleThrowable(t); log.warn(sm.getString( @@ -2283,7 +2283,7 @@ public abstract class WebappClassLoaderBase extends URLClassLoader getContextName()), e); } catch (InaccessibleObjectException e) { // Must be running on without the necessary command line options. - log.warn(sm.getString("webappClassLoader.addExportsRmi", this.getClass().getModule().getName())); + log.warn(sm.getString("webappClassLoader.addExportsRmi", getCurrentModuleName())); } } @@ -2298,11 +2298,20 @@ public abstract class WebappClassLoaderBase extends URLClassLoader "webappClassLoader.clearObjectStreamClassCachesFail", getContextName()), e); } catch (InaccessibleObjectException e) { // Must be running on without the necessary command line options. - log.warn(sm.getString("webappClassLoader.addExportsJavaIo", this.getClass().getModule().getName())); + log.warn(sm.getString("webappClassLoader.addExportsJavaIo", getCurrentModuleName())); } } + private String getCurrentModuleName() { + String moduleName = this.getClass().getModule().getName(); + if (moduleName == null) { + moduleName = "ALL-UNNAMED"; + } + return moduleName; + } + + private void clearCache(Class<?> target, String mapName) throws ReflectiveOperationException, SecurityException, ClassCastException { Field f = target.getDeclaredField(mapName); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ca1521f30f..2b22817b79 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -111,6 +111,10 @@ Update the memory leak protection code to support stopping application created executor threads when running on Java 19 and later. (markt) </fix> + <fix> + Improve the error message if a required <code>--add-opens</code> option + is missing. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
