This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5b91c9a05d9f1af8863a62b28f4acf80985babac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 20 16:45:52 2021 +0100
Fix some optimisations around omit.
The optimisations were not applied because the check for the string
literals "true" and "false" did not account for the tested values being
quoted.
---
java/org/apache/jasper/compiler/Generator.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 28fd180..664e054 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2029,14 +2029,16 @@ class Generator {
if (omitAttr == null) {
omit = "false";
} else {
+ // String literals returned by attributeValue will be
+ // quoted and escaped.
omit = attributeValue(omitAttr, false, boolean.class);
- if ("true".equals(omit)) {
+ if ("\"true\"".equals(omit)) {
continue;
}
}
value = generateNamedAttributeValue(
attrs[i].getNamedAttributeNode());
- if ("false".equals(omit)) {
+ if ("\"false\"".equals(omit)) {
nvp = " + \" " + attrs[i].getName() + "=\\\"\" + " +
value + " + \"\\\"\"";
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
