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/05/07 10:46:30 UTC
[tomcat] 02/02: Remove unnecessary code (EL can't be null here)
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 2657bc2ecb51417474bc17a9dabb4ec67d156412
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 6 22:33:29 2021 +0100
Remove unnecessary code (EL can't be null here)
---
java/org/apache/jasper/compiler/Generator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 5100bae..66c64e4 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3110,9 +3110,9 @@ class Generator {
sb.append("}))");
attrValue = sb.toString();
} else {
+ // Must be EL
// run attrValue through the expression interpreter
- String mapName = (attr.getEL() != null) ? attr.getEL()
- .getMapName() : null;
+ String mapName = attr.getEL().getMapName();
attrValue = elInterpreter.interpreterCall(ctxt,
this.isTagFile, attrValue, c[0], mapName);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org