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 9c54ecadd6 Remove/deprecate some more SecurityManager related plumbing
9c54ecadd6 is described below
commit 9c54ecadd6f8b0fb1e1f29661f03681b65239c16
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jan 19 17:08:22 2023 +0000
Remove/deprecate some more SecurityManager related plumbing
---
java/org/apache/juli/ClassLoaderLogManager.java | 6 +-----
java/org/apache/juli/WebappProperties.java | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index 5fc80f62d1..77e7a81720 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -401,11 +401,7 @@ public class ClassLoaderLogManager extends LogManager {
InputStream is = null;
// Special case for URL classloaders which are used in containers:
// only look in the local repositories to avoid redefining loggers 20
times
- if (classLoader instanceof WebappProperties) {
- if (((WebappProperties) classLoader).hasLoggingConfig()) {
- is = classLoader.getResourceAsStream("logging.properties");
- }
- } else if (classLoader instanceof URLClassLoader) {
+ if (classLoader instanceof URLClassLoader) {
URL logConfig =
((URLClassLoader)classLoader).findResource("logging.properties");
if(null != logConfig) {
diff --git a/java/org/apache/juli/WebappProperties.java
b/java/org/apache/juli/WebappProperties.java
index b524c5a5c4..7c94b1c49d 100644
--- a/java/org/apache/juli/WebappProperties.java
+++ b/java/org/apache/juli/WebappProperties.java
@@ -60,6 +60,9 @@ public interface WebappProperties {
* @return {@code true} if the web application includes a logging
* configuration at the standard location of
* /WEB-INF/classes/logging.properties.
+ *
+ * @deprecated Unused. Will be removed in Tomcat 12 onwards.
*/
+ @Deprecated
boolean hasLoggingConfig();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
