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 03b0119 Remove deprecated code
03b0119 is described below
commit 03b01198fa6fa132be4b3528daa9b648c314a9dd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 30 20:27:10 2022 +0100
Remove deprecated code
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 13 -------------
webapps/docs/changelog.xml | 7 +++----
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 0a0053e..c8b1ee4 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -428,19 +428,6 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
// ------------------------------------------------------------- Properties
/**
- * Unused. Always returns {@code null}.
- *
- * @return associated resources.
- *
- * @deprecated This will be removed in Tomcat 10.1.x onwards
- */
- @Deprecated
- public WebResourceRoot getResources() {
- return null;
- }
-
-
- /**
* Set associated resources.
* @param resources the resources from which the classloader will
* load the classes
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61180d2..cb82a40 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,10 +114,9 @@
<code>String</code>. This is a security hardening measure. (markt)
</fix>
<add>
- Effectively disable the
- <code>WebappClassLoaderBase.getResources()</code> method as it is not
- used and if something accidently exposes the class loader this method
- can be used to gain access to Tomcat internals. (markt)
+ Remove the <code>WebappClassLoaderBase.getResources()</code> method as
+ it is not used and if something accidently exposes the class loader
+ this method can be used to gain access to Tomcat internals. (markt)
</add>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
