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:33:44 UTC
[tomcat] branch master updated (3fc0c3d -> e635386)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 3fc0c3d Skip interfaces for HandlesTypes
new a67faf3 Remove unnecessary code
new eeeca45 Remove unnecessary code
new dd60b5e REmove unnecessary code
new e635386 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dd60b5e446a44495dcbf6a90e84f4c5ec2cd716d
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 bef26f6..093cde3 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2004,8 +2004,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] 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a67faf3ac7f2225f6a1dac6c6355ed8226665039
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 8031b74..690f538 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1865,17 +1865,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] 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit eeeca457ff1ac70604c9bdb018269715690523e5
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 690f538..bef26f6 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1919,9 +1919,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] 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e6353864e6245da2553e6f56c07819dd8e703607
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 093cde3..3fdf3c4 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2016,14 +2016,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