[tomcat] branch 7.0.x updated: Avoid InaccessibleObjectException on Java 16

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new e2aa9ec  Avoid InaccessibleObjectException on Java 16
e2aa9ec is described below

commit e2aa9ec094e6fa20ef37ea772065c3face8be0dd
Author: remm <r...@apache.org>
AuthorDate: Mon Dec 14 09:33:10 2020 +0100

    Avoid InaccessibleObjectException on Java 16
---
 java/org/apache/catalina/loader/WebappClassLoaderBase.java | 6 ++++++
 webapps/docs/changelog.xml                                 | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index a9bfdce..0854d9f 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2623,6 +2623,12 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
                         log.warn(sm.getString(
                                 "webappClassLoader.stopThreadFail",
                                 thread.getName(), contextName), e);
+                    } catch (RuntimeException e) {
+                        // InaccessibleObjectException is only available in 
Java 9+,
+                        // swapped for RuntimeException
+                        log.warn(sm.getString(
+                                "webappClassLoader.stopThreadFail",
+                                thread.getName(), contextName), e);
                     }
 
                     // Stopping an executor automatically interrupts the
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dd24280..8c15c5e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -131,6 +131,10 @@
         Ensure that values are not duplicated when manipulating the vary 
header.
         Based on a pull request by Fredrik Fall. (markt)
       </fix>
+      <fix>
+        Avoid uncaught InaccessibleObjectException on Java 16 trying to clear
+        references threads. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org