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 <ma...@apache.org> 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