This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 41ee63afd5 Revert to logging scan results at debug level
41ee63afd5 is described below
commit 41ee63afd58962fe2250c6cd3177a046ea31d7d3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 6 10:58:16 2024 +0100
Revert to logging scan results at debug level
---
java/org/apache/jasper/servlet/TldScanner.java | 24 ++++++++++++------------
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/jasper/servlet/TldScanner.java
b/java/org/apache/jasper/servlet/TldScanner.java
index f38340eb25..e20be33b3c 100644
--- a/java/org/apache/jasper/servlet/TldScanner.java
+++ b/java/org/apache/jasper/servlet/TldScanner.java
@@ -243,12 +243,12 @@ public class TldScanner {
}
}
if (found) {
- if (log.isTraceEnabled()) {
-
log.trace(Localizer.getMessage("jsp.tldCache.tldInResourcePath", startPath));
+ if (log.isDebugEnabled()) {
+
log.debug(Localizer.getMessage("jsp.tldCache.tldInResourcePath", startPath));
}
} else {
- if (log.isTraceEnabled()) {
-
log.trace(Localizer.getMessage("jsp.tldCache.noTldInResourcePath", startPath));
+ if (log.isDebugEnabled()) {
+
log.debug(Localizer.getMessage("jsp.tldCache.noTldInResourcePath", startPath));
}
}
}
@@ -318,13 +318,13 @@ public class TldScanner {
}
}
if (found) {
- if (log.isTraceEnabled()) {
- log.trace(Localizer.getMessage("jsp.tldCache.tldInJar",
jarFileUrl.toString()));
+ if (log.isDebugEnabled()) {
+ log.debug(Localizer.getMessage("jsp.tldCache.tldInJar",
jarFileUrl.toString()));
}
} else {
foundJarWithoutTld = true;
- if (log.isTraceEnabled()) {
- log.trace(Localizer.getMessage(
+ if (log.isDebugEnabled()) {
+ log.debug(Localizer.getMessage(
"jsp.tldCache.noTldInJar", jarFileUrl.toString()));
}
}
@@ -374,13 +374,13 @@ public class TldScanner {
}
});
if (foundFileWithoutTld) {
- if (log.isTraceEnabled()) {
- log.trace(Localizer.getMessage("jsp.tldCache.tldInDir",
+ if (log.isDebugEnabled()) {
+ log.debug(Localizer.getMessage("jsp.tldCache.tldInDir",
file.getAbsolutePath()));
}
} else {
- if (log.isTraceEnabled()) {
- log.trace(Localizer.getMessage("jsp.tldCache.noTldInDir",
+ if (log.isDebugEnabled()) {
+ log.debug(Localizer.getMessage("jsp.tldCache.noTldInDir",
file.getAbsolutePath()));
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 295d6b0e3c..43ec82753d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.29 (schultz)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Switch the <code>TldScanner</code> back to logging detailed scan
+ results at debug level rather than trace level. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
