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
The following commit(s) were added to refs/heads/main by this push:
new 41cb36a Remove a pre-Java 9 workaround
41cb36a is described below
commit 41cb36afc94aacff791630619209a7f6d47f5e02
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jul 28 21:38:56 2021 +0100
Remove a pre-Java 9 workaround
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 12ca9ab..0cdef0a 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1883,10 +1883,8 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
usingExecutor = true;
}
}
- } catch (/*SecurityException |*/ NoSuchFieldException |
/*IllegalArgumentException |*/
- IllegalAccessException | RuntimeException e) {
- // FIXME: InaccessibleObjectException is only
available in Java 9+,
- // swapped for RuntimeException for now
+ } catch (SecurityException | NoSuchFieldException |
IllegalArgumentException |
+ IllegalAccessException |
InaccessibleObjectException e) {
log.warn(sm.getString("webappClassLoader.stopThreadFail",
thread.getName(), getContextName()), e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
