[tomcat] 04/04: Remove unnecessary code
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 bf5b9feca166557134120f0fc5210588c7b3673d
Author: Mark Thomas
AuthorDate: Thu Apr 22 17:19:05 2021 +0100
Remove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index c98ddf7..474ac5c 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2802,10 +2802,12 @@ class Generator {
if (varName == null) {
varName = n.getTagData().getAttributeString(
tagVarInfo.getNameFromAttribute());
-} else if (tagVarInfo.getNameFromAttribute() != null) {
-// alias
-continue;
}
+// Alias is not possible here.
+// Alias can only be configured for tag files. As SimpleTag
+// implementations, isFragment will always be true above
+// hence execution never reaches this point.
+
String tmpVarName = "_jspx_" + varName + "_"
+ n.getCustomNestingLevel();
out.printin(tmpVarName);
@@ -2872,10 +2874,12 @@ class Generator {
if (varName == null) {
varName = n.getTagData().getAttributeString(
tagVarInfo.getNameFromAttribute());
-} else if (tagVarInfo.getNameFromAttribute() != null) {
-// alias
-continue;
}
+// Alias is not possible here.
+// Alias can only be configured for tag files. As SimpleTag
+// implementations, isFragment will always be true above
+// hence execution never reaches this point.
+
String tmpVarName = "_jspx_" + varName + "_"
+ n.getCustomNestingLevel();
out.printin(varName);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Remove unnecessary code
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 99dd5ecff3b46340b9578ce1ea6cf01165b1cb3c
Author: Mark Thomas
AuthorDate: Mon Apr 19 20:38:44 2021 +0100
Remove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 22346a3..b3e177c 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1855,8 +1855,9 @@ class Generator {
// non-null
if (infos.length > 0) {
for (VariableInfo info : infos) {
-if (info != null && info.getVarName() != null)
-pageInfo.getVarInfoNames().add(info.getVarName());
+// A null variable name will trigger multiple compilation
+// failures so assume non-null here
+pageInfo.getVarInfoNames().add(info.getVarName());
}
}
TagVariableInfo[] tagInfos = n.getTagVariableInfos();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Remove unnecessary code
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 3f9391ae035ee9eac76b026b371832d3d41581ef
Author: Mark Thomas
AuthorDate: Mon Apr 19 20:38:44 2021 +0100
Remove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index abbe594..17ef82f 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1872,8 +1872,9 @@ class Generator {
// non-null
if (infos.length > 0) {
for (VariableInfo info : infos) {
-if (info != null && info.getVarName() != null)
-pageInfo.getVarInfoNames().add(info.getVarName());
+// A null variable name will trigger multiple compilation
+// failures so assume non-null here
+pageInfo.getVarInfoNames().add(info.getVarName());
}
}
TagVariableInfo[] tagInfos = n.getTagVariableInfos();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Remove unnecessary code
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 daac8bb943c18efbf31246b13ee8c52b4d673e32
Author: Mark Thomas
AuthorDate: Mon Apr 19 20:38:44 2021 +0100
Remove unnecessary code
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 3125fb5..8031b74 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1859,8 +1859,9 @@ class Generator {
// non-null
if (infos.length > 0) {
for (VariableInfo info : infos) {
-if (info != null && info.getVarName() != null)
-pageInfo.getVarInfoNames().add(info.getVarName());
+// A null variable name will trigger multiple compilation
+// failures so assume non-null here
+pageInfo.getVarInfoNames().add(info.getVarName());
}
}
TagVariableInfo[] tagInfos = n.getTagVariableInfos();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Remove unnecessary code
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 092e7eaa23c96aab2d7f93c023174c535c1afcf3
Author: Mark Thomas
AuthorDate: Tue Nov 3 17:06:05 2020 +
Remove unnecessary code
---
java/org/apache/el/ExpressionFactoryImpl.java | 7 ---
1 file changed, 7 deletions(-)
diff --git a/java/org/apache/el/ExpressionFactoryImpl.java
b/java/org/apache/el/ExpressionFactoryImpl.java
index 719cd45..e3aa471 100644
--- a/java/org/apache/el/ExpressionFactoryImpl.java
+++ b/java/org/apache/el/ExpressionFactoryImpl.java
@@ -36,13 +36,6 @@ import org.apache.el.util.MessageFactory;
@aQute.bnd.annotation.spi.ServiceProvider(value=jakarta.el.ExpressionFactory.class)
public class ExpressionFactoryImpl extends ExpressionFactory {
-/**
- *
- */
-public ExpressionFactoryImpl() {
-super();
-}
-
@Override
public Object coerceToType(Object obj, Class type) {
return ELSupport.coerceToType(null, obj, type);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
