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 c04c7b462170f7518b09588a9ad45e1bf7e53434 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Apr 19 18:09:59 2021 +0100 Remove unnecessary code --- java/org/apache/jasper/compiler/Generator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index 627e72e..abbe594 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -1868,7 +1868,9 @@ class Generator { // Add the named objects to the list of 'introduced' names to enable // a later test as per JSP.5.3 VariableInfo[] infos = n.getVariableInfos(); - if (infos != null && infos.length > 0) { + // The Validator always calls setTagData() which ensures infos is + // non-null + if (infos.length > 0) { for (VariableInfo info : infos) { if (info != null && info.getVarName() != null) pageInfo.getVarInfoNames().add(info.getVarName()); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org