You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/04/20 17:34:09 UTC
[tomcat] branch 9.0.x updated (8de2534 -> 5b91c9a)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 8de2534 Skip interfaces for HandlesTypes
new fd2e4ac Remove unnecessary code
new 56620ae Remove unnecessary code
new 6ce1cf8 REmove unnecessary code
new 5b91c9a Fix some optimisations around omit.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/jasper/compiler/Generator.java | 32 ++++++++++++++------------
1 file changed, 17 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/04: REmove unnecessary code
Posted by ma...@apache.org.
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 6ce1cf87d27396865661560c305d9ed32197a8c7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 20 16:42:06 2021 +0100
REmove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 1a2fa24..28fd180 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2017,8 +2017,9 @@ class Generator {
// Compute attribute value string for XML-style and named
// attributes
Hashtable<String,String> map = new Hashtable<>();
+ // Validator ensures this is non-null
Node.JspAttribute[] attrs = n.getJspAttributes();
- for (int i = 0; attrs != null && i < attrs.length; i++) {
+ for (int i = 0; i < attrs.length; i++) {
String value = null;
String nvp = null;
if (attrs[i].isNamedAttribute()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/04: Remove unnecessary code
Posted by ma...@apache.org.
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 56620aecb96aac602ded09b70109eafa2eff973a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 20 15:49:14 2021 +0100
Remove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index b4697b5..1a2fa24 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1932,9 +1932,7 @@ class Generator {
if (ci.isScriptless() && !ci.hasScriptingVars()) {
// Generate end of method
- if (methodNesting > 0) {
- out.printil("return false;");
- }
+ out.printil("return false;");
out.popIndent();
out.printil("}");
out.popIndent();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/04: Remove unnecessary code
Posted by ma...@apache.org.
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 fd2e4acbba5c37a3c8fbbec59d6f532a1e84c341
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 20 14:14:32 2021 +0100
Remove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 17ef82f..b4697b5 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1878,17 +1878,18 @@ class Generator {
}
}
TagVariableInfo[] tagInfos = n.getTagVariableInfos();
- if (tagInfos != null && tagInfos.length > 0) {
+ // The way Tomcat constructs the TagInfo, getTagVariableInfos()
+ // will never return null.
+ if (tagInfos.length > 0) {
for (TagVariableInfo tagInfo : tagInfos) {
- if (tagInfo != null) {
- String name = tagInfo.getNameGiven();
- if (name == null) {
- String nameFromAttribute =
- tagInfo.getNameFromAttribute();
- name = n.getAttributeValue(nameFromAttribute);
- }
- pageInfo.getVarInfoNames().add(name);
+ // tagInfo is always non-null
+ String name = tagInfo.getNameGiven();
+ if (name == null) {
+ String nameFromAttribute =
+ tagInfo.getNameFromAttribute();
+ name = n.getAttributeValue(nameFromAttribute);
}
+ pageInfo.getVarInfoNames().add(name);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/04: Fix some optimisations around omit.
Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org