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 6cffe2ac39 Fix BZ 69623 - regression in
ClassLoader.getResource().getContent()
6cffe2ac39 is described below
commit 6cffe2ac39f26304cb4a4c6be1232ccb4cb20d22
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Mar 25 14:54:20 2025 +0000
Fix BZ 69623 - regression in ClassLoader.getResource().getContent()
https://bz.apache.org/bugzilla/show_bug.cgi?id=69623
---
java/org/apache/catalina/webresources/CachedResource.java | 7 +++++++
webapps/docs/changelog.xml | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index 68f6b4c5c6..75cbab21b2 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -32,6 +32,7 @@ import java.security.cert.Certificate;
import java.text.Collator;
import java.util.Arrays;
import java.util.Locale;
+import java.util.Objects;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
@@ -592,6 +593,12 @@ public class CachedResource implements WebResource {
private WebResource getResource() {
return root.getResource(webAppPath, false,
usesClassLoaderResources);
}
+
+ @Override
+ public String getContentType() {
+ // "content/unknown" is the value used by
sun.net.www.URLConnection. It is used here for consistency.
+ return Objects.requireNonNullElse(getResource().getMimeType(),
"content/unknown");
+ }
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 37fa07bd45..25f6f8c3be 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,12 @@
processing the request as if the GET method had been used is unchanged.
(markt)
</add>
+ <fix>
+ <bug>69623</bug>: Correct a long standing regression that meant that
+ calls to <code>ClassLoader.getResource().getContent()</code> failed
when
+ made from within a web application with resource caching enabled.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
