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 a6eaeaa4d6742b6af4f988c5ed0edc1978efe217 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu May 6 17:37:19 2021 +0100 Remove unnecessary code If an attribute value is null, it must be a named attribute. --- java/org/apache/jasper/compiler/Generator.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index 860aeb9..82238c9 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -2995,17 +2995,14 @@ class Generator { String attrValue = attr.getValue(); if (attrValue == null) { - if (attr.isNamedAttribute()) { - if (n.checkIfAttributeIsJspFragment(attr.getName())) { - // XXX - no need to generate temporary variable here - attrValue = generateNamedAttributeJspFragment(attr - .getNamedAttributeNode(), tagHandlerVar); - } else { - attrValue = generateNamedAttributeValue(attr - .getNamedAttributeNode()); - } + // Must be a named attribute + if (n.checkIfAttributeIsJspFragment(attr.getName())) { + // XXX - no need to generate temporary variable here + attrValue = generateNamedAttributeJspFragment(attr + .getNamedAttributeNode(), tagHandlerVar); } else { - return null; + attrValue = generateNamedAttributeValue(attr + .getNamedAttributeNode()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org