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 25845e375f Regression for BZ 68721 - report correct exception
25845e375f is described below
commit 25845e375f1dcb81d5c18ee4a67aba6257b78860
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 11 17:26:54 2024 +0100
Regression for BZ 68721 - report correct exception
Some instances of LinkageError were incorrectly reported as
ClassNotFoundException
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++++
webapps/docs/changelog.xml | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 0a3edb4e18..f6cfa08e4c 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2124,6 +2124,10 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// Re-throw the original exception
throw e;
}
+ if (clazz == null) {
+ // Not BZ 68721
+ throw e;
+ }
}
entry.loadedClass = clazz;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1273c41722..5cc937d544 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,11 @@
for retrieving extended/additional information from an established
GSS context. (michaelo)
</add>
+ <fix>
+ Correct a regression in the fix for <bug>68721</bug> that caused some
+ instances of <code>LinkageError</code> to be reported as
+ <code>ClassNotFoundException</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
