You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/04/20 17:40:24 UTC

[tomcat] branch 9.0.x updated (5b91c9a -> e478249)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 5b91c9a  Fix some optimisations around omit.
     new 6c1e1e5  Remove unnecessary code
     new e478249  Remove unnecessary code. No need to escape tabs in String literals.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/jasper/compiler/Generator.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 01/02: Remove unnecessary code

Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 02/02: Remove unnecessary code. No need to escape tabs in String literals.

Posted by ma...@apache.org.
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 e478249f57af7babd6aec2b51467865f364919bc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 20 18:37:32 2021 +0100

    Remove unnecessary code. No need to escape tabs in String literals.
---
 java/org/apache/jasper/compiler/Generator.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 342d502..94af4df 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2223,9 +2223,6 @@ class Generator {
                     // add a Smap for this line
                     n.addSmap(srcLine);
                     break;
-                case '\t': // Not sure we need this
-                    sb.append('\\').append('t');
-                    break;
                 default:
                     sb.append(ch);
                 }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org