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 92e8ba07dca280b9ad391003c8dc8c0eb5e08aef
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 7 16:09:13 2021 +0100
Remove unnecessary code
Since attr.isDeferredInput() -> tai != null then tai can't be null here
---
java/org/apache/jasper/compiler/Generator.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index b941532..9e1c97e 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3049,14 +3049,13 @@ class Generator {
// should the expression be evaluated before passing to
// the setter?
boolean evaluate = false;
- if (tai != null && tai.canBeRequestTime()) {
+ if (tai.canBeRequestTime()) {
evaluate = true; // JSP.2.3.2
}
if (attr.isDeferredInput()) {
evaluate = false; // JSP.2.3.3
}
- if (attr.isDeferredInput() && tai != null &&
- tai.canBeRequestTime()) {
+ if (attr.isDeferredInput() && tai.canBeRequestTime()) {
evaluate = !attrValue.contains("#{"); // JSP.2.3.5
}
if (evaluate) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
