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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f2d784  Remove unnecessary code
9f2d784 is described below

commit 9f2d78449f409ecffade937dfc7441d90ac914b3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 11 21:49:07 2021 +0100

    Remove unnecessary code
    
    This method is called for a SimpleTag.
    pushBodyCountVar is always null for SimpleTag as the code where it is
    set in visit(CustomTag) is never called if n.implementsSimpleTag() is
    true.
---
 java/org/apache/jasper/compiler/Generator.java | 4 ----
 webapps/docs/changelog.xml                     | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 25c67ac..b34c6b7 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3300,10 +3300,6 @@ class Generator {
             boolean tmpIsFragment = isFragment;
             isFragment = true;
             String pushBodyCountVarSave = pushBodyCountVar;
-            if (pushBodyCountVar != null) {
-                // Use a fixed name for push body count, to simplify code gen
-                pushBodyCountVar = "_jspx_push_body_count";
-            }
             visitBody(n);
             out = outSave;
             parent = tmpParent;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5bd018f..5babeb4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,14 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 10.0.7 (markt)" rtext="in development">
+  <subsection name="Jasper">
+    <changelog>
+      <scode>
+        Review code used to generate Java source from JSPs and tags and remove
+        code found to be unnecessary. (markt)
+      </scode>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 10.0.6 (markt)" rtext="release in progress">
   <subsection name="Catalina">

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

Reply via email to