This is an automated email from the ASF dual-hosted git repository.
remm 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 9968b16 Avoid InaccessibleObjectException on Java 16
9968b16 is described below
commit 9968b1655e50ba82a73597427bcbc40a5c56b48d
Author: remm <[email protected]>
AuthorDate: Mon Dec 14 09:33:10 2020 +0100
Avoid InaccessibleObjectException on Java 16
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 5 +++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 75629d9..714e316 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1808,8 +1808,9 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
usingExecutor = true;
}
}
- } catch (SecurityException | NoSuchFieldException |
IllegalArgumentException |
- IllegalAccessException e) {
+ } catch (NoSuchFieldException | IllegalAccessException |
RuntimeException e) {
+ // InaccessibleObjectException is only available in
Java 9+,
+ // swapped for RuntimeException
log.warn(sm.getString("webappClassLoader.stopThreadFail",
thread.getName(), getContextName()), e);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6b1a6c6..6755a79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,10 @@
be logged in the access log using the new <code>%{peer}a</code>
syntax. (rjung)
</add>
+ <fix>
+ Avoid uncaught InaccessibleObjectException on Java 16 trying to clear
+ references threads. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
