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/08 18:20:01 UTC
[tomcat] branch 8.5.x updated (d32f3ee -> 9b94296)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d32f3ee Remove unnecessary code. parent is always non-null
new 2771fe8 Remove debug code
new 9b94296 Remove unnecessary code
The 2 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 | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9b942960afc36893adb99b36c8251bcb10068bfe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 8 18:50:03 2021 +0100
Remove unnecessary code
Body of parent always consists of NodeParamAction instances
---
java/org/apache/jasper/compiler/Generator.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 2717ffc..638dac4 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1106,14 +1106,14 @@ class Generator {
if (subelements != null) {
for (int i = 0; i < subelements.size(); i++) {
Node n = subelements.getNode(i);
- if (n instanceof Node.ParamAction) {
- Node.Nodes paramSubElements = n.getBody();
- for (int j = 0; (paramSubElements != null)
- && (j < paramSubElements.size()); j++) {
- Node m = paramSubElements.getNode(j);
- if (m instanceof Node.NamedAttribute) {
- generateNamedAttributeValue((Node.NamedAttribute) m);
- }
+ // Validation during parsing ensures n is an instance of
+ // Node.ParamAction
+ Node.Nodes paramSubElements = n.getBody();
+ for (int j = 0; (paramSubElements != null)
+ && (j < paramSubElements.size()); j++) {
+ Node m = paramSubElements.getNode(j);
+ if (m instanceof Node.NamedAttribute) {
+ generateNamedAttributeValue((Node.NamedAttribute) m);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Remove debug code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2771fe8c3be8c3f07ab7aa3abf08f3d53bdbd8a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 8 18:44:42 2021 +0100
Remove debug code
---
java/org/apache/jasper/compiler/Generator.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index ee44577..2717ffc 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1047,7 +1047,6 @@ class Generator {
@Override
public void visit(Node.ELExpression n) throws JasperException {
n.setBeginJavaLine(out.getJavaLine());
- System.out.println("[" + pageInfo.isELIgnored() + "] [" + n.getEL() + "]");
out.printil("out.write("
+ elInterpreter.interpreterCall(ctxt, this.isTagFile,
n.getType() + "{" + n.getText() + "}",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org