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 6c1e1e5360d97aa4856751ea6b5e1874df51c176 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Apr 20 18:36:59 2021 +0100 Remove unnecessary code --- java/org/apache/jasper/compiler/Generator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index 664e054..342d502 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -2105,7 +2105,7 @@ class Generator { String text = n.getText(); // If the extended option is being used attempt to minimize the // frequency of regex operations. - if ((ctxt != null) && ctxt.getOptions().getTrimSpaces().equals(TrimSpacesOption.EXTENDED) && + if (ctxt.getOptions().getTrimSpaces().equals(TrimSpacesOption.EXTENDED) && text.contains("\n")) { // Ensure there are no <pre> or </pre> tags embedded in this // text - if there are, we want to NOT modify the whitespace. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org