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 937b156 Guard new escape routines for null values new d5b958a Remove unnecessary code. Only called for Tag files. new cb66b1f Remove unnecessary code. new 74717b3 Improve code coverage of Generator tests The 3 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 | 42 +- test/org/apache/jasper/compiler/TestGenerator.java | 634 ++++++++++++++++++++- .../jasper/runtime/TestCustomHttpJspPage.java | 20 +- test/org/apache/jasper/runtime/TesterBean.java | 26 + test/webapp/WEB-INF/bugs.tld | 102 +++- .../bug58444.jsp => WEB-INF/tags/circular01.tag} | 18 +- .../bug58444.jsp => WEB-INF/tags/circular02.tag} | 18 +- .../bug58444.jsp => WEB-INF/tags/dobody.tagx} | 25 +- .../tags/echo-deferred-method.tag} | 16 +- .../bug58444.jsp => WEB-INF/tags/forward.tag} | 13 +- .../bug58444.jsp => WEB-INF/tags/invoke.tagx} | 23 +- .../bug58444.jsp => WEB-INF/tags/jsp-root.tagx} | 20 +- .../bug58444.jsp => WEB-INF/tags/no-jsp-root.tagx} | 18 +- .../bug58444.jsp => WEB-INF/tags/setters.tag} | 15 +- .../tags/variable-from-attr.tag} | 16 +- .../bug58444.jsp => WEB-INF/tags/variable.tag} | 18 +- test/webapp/WEB-INF/web.xml | 134 +++++ .../bug5nnnn/{bug58444.jsp => bug58444a.jsp} | 0 .../bug5nnnn/{bug58444.jsp => bug58444b.jsp} | 0 .../generator/attribute-01.jsp} | 22 +- test/webapp/jsp/generator/attribute-02.jsp | 36 ++ .../generator/attribute-03.jsp} | 19 +- test/webapp/jsp/generator/attribute-04.jsp | 62 ++ .../bug58444.jsp => jsp/generator/beaninfo-01.jsp} | 13 +- .../generator/break-el-interpreter.jsp} | 14 +- .../generator/break-string-interpreter.jsp} | 14 +- .../bug58444.jsp => jsp/generator/circular-01.jsp} | 11 +- .../generator/customtag-02.jsp} | 18 +- .../generator/customtag-03.jsp} | 14 +- .../generator/customtag-04.jsp} | 14 +- .../generator/deferred-method-01.jsp} | 17 +- .../generator/deferred-method-02.jsp} | 17 +- .../bug58444.jsp => jsp/generator/dobody-01.jsp} | 13 +- .../bug58444.jsp => jsp/generator/element-01.jsp} | 20 +- .../bug58444.jsp => jsp/generator/forward-01.jsp} | 14 +- .../bug58444.jsp => jsp/generator/forward-02.jsp} | 15 +- .../bug58444.jsp => jsp/generator/forward-03.jsp} | 13 +- .../bug58444.jsp => jsp/generator/forward-04.jsp} | 11 +- .../bug58444.jsp => jsp/generator/include-01.jsp} | 17 +- .../generator/info-conflict-none.jsp} | 13 +- .../generator/info-conflict.jsp} | 13 +- .../bug58444.jsp => jsp/generator/info.jsp} | 12 +- .../bug58444.jsp => jsp/generator/invoke-01.jsp} | 13 +- .../bug58444.jsp => jsp/generator/jsp-id.jsp} | 14 +- .../bug58444.jsp => jsp/generator/jsp-id.jspx} | 22 +- test/webapp/jsp/generator/plugin-01.jspx | 54 ++ .../generator/scriptingvariables-01.jsp} | 20 +- .../generator/scriptingvariables-02.jsp} | 19 +- test/webapp/jsp/generator/setproperty-01.jsp | 32 ++ .../bug58444.jsp => jsp/generator/setters-01.jsp} | 11 +- .../generator/single-threaded.jsp} | 12 +- test/webapp/jsp/generator/templatetext-01.jsp | 283 +++++++++ test/webapp/jsp/generator/templatetext-02.jsp | 19 + .../generator/try-catch-finally.jsp} | 16 +- .../bug58444.jsp => jsp/generator/usebean-01.jsp} | 13 +- .../bug58444.jsp => jsp/generator/usebean-02.jsp} | 13 +- .../bug58444.jsp => jsp/generator/usebean-03.jsp} | 29 +- .../bug58444.jsp => jsp/generator/usebean-04.jsp} | 13 +- .../bug58444.jsp => jsp/generator/usebean-05.jsp} | 13 +- .../bug58444.jsp => jsp/generator/usebean-06.jsp} | 13 +- .../bug58444.jsp => jsp/generator/usebean-07.jsp} | 13 +- .../bug58444.jsp => jsp/generator/usebean-08.jsp} | 23 +- .../generator/variable-from-attr-nested.jsp} | 16 +- .../variable-tagfile-from-attr-nested.jsp} | 14 +- .../generator/variable-tagfile-nested.jsp} | 21 +- .../generator/variable-tei-nested.jsp} | 20 +- .../generator/x-powered-by.jsp} | 13 +- .../generator/xml-doctype-01.jspx} | 22 +- .../generator/xml-doctype-02.jspx} | 23 +- .../generator/xml-prolog-01.jspx} | 21 +- .../generator/xml-prolog-02.jspx} | 21 +- .../generator/xml-prolog-tag.jspx} | 18 +- 72 files changed, 1859 insertions(+), 545 deletions(-) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/circular01.tag} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/circular02.tag} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/dobody.tagx} (57%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/echo-deferred-method.tag} (66%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/forward.tag} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/invoke.tagx} (58%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/jsp-root.tagx} (68%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/no-jsp-root.tagx} (68%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/setters.tag} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/variable-from-attr.tag} (59%) copy test/webapp/{bug5nnnn/bug58444.jsp => WEB-INF/tags/variable.tag} (61%) copy test/webapp/bug5nnnn/{bug58444.jsp => bug58444a.jsp} (100%) copy test/webapp/bug5nnnn/{bug58444.jsp => bug58444b.jsp} (100%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/attribute-01.jsp} (56%) create mode 100644 test/webapp/jsp/generator/attribute-02.jsp copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/attribute-03.jsp} (62%) create mode 100644 test/webapp/jsp/generator/attribute-04.jsp copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/beaninfo-01.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/break-el-interpreter.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/break-string-interpreter.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/circular-01.jsp} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/customtag-02.jsp} (66%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/customtag-03.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/customtag-04.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/deferred-method-01.jsp} (63%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/deferred-method-02.jsp} (63%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/dobody-01.jsp} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/element-01.jsp} (58%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/forward-01.jsp} (80%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/forward-02.jsp} (81%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/forward-03.jsp} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/forward-04.jsp} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/include-01.jsp} (76%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/info-conflict-none.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/info-conflict.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/info.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/invoke-01.jsp} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/jsp-id.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/jsp-id.jspx} (67%) create mode 100644 test/webapp/jsp/generator/plugin-01.jspx copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/scriptingvariables-01.jsp} (59%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/scriptingvariables-02.jsp} (63%) create mode 100644 test/webapp/jsp/generator/setproperty-01.jsp copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/setters-01.jsp} (74%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/single-threaded.jsp} (69%) create mode 100644 test/webapp/jsp/generator/templatetext-01.jsp create mode 100644 test/webapp/jsp/generator/templatetext-02.jsp copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/try-catch-finally.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-01.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-02.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-03.jsp} (51%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-04.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-05.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-06.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-07.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/usebean-08.jsp} (62%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/variable-from-attr-nested.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/variable-tagfile-from-attr-nested.jsp} (71%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/variable-tagfile-nested.jsp} (70%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/variable-tei-nested.jsp} (67%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/x-powered-by.jsp} (69%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/xml-doctype-01.jspx} (65%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/xml-doctype-02.jspx} (63%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/xml-prolog-01.jspx} (68%) copy test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/xml-prolog-02.jspx} (68%) rename test/webapp/{bug5nnnn/bug58444.jsp => jsp/generator/xml-prolog-tag.jspx} (75%) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org