On 23/06/2026 21:02, Rémy Maucherat wrote:
On Tue, Jun 23, 2026 at 9:58 PM Rainer Jung <[email protected]> wrote:
Am 23.06.26 um 18:34 schrieb [email protected]:
This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fbd37c72c2 Fix BZ 70120. Don't re-use failed tags.
fbd37c72c2 is described below
commit fbd37c72c2b48174b0782c94b52d8f24067149b4
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 23 17:29:42 2026 +0100
Fix BZ 70120. Don't re-use failed tags.
The original fix for BZ 69333 was over eager and caused a regression.
The fix for the regression (BZ 69399) was incomplete. This commit
completes the regression fix.
...
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java
b/test/org/apache/jasper/compiler/TestGenerator.java
index e53320c455..c56f78e9a9 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
...
+ @Override
+ public int doStartTag() throws JspException {
+ ServletRequest request = pageContext.getRequest();
+ boolean throwOnStart =
Boolean.parseBoolean(request.getParameter("throwOnStart"));
+ if (throwOnStart) {
+ state += "lastStartFailed";
+ throw new IllegalSelectorException();
+ } else {
+ try {
+ if (!state.isBlank()) {
String.isBlank() s Java 11
+ pageContext.getOut().print(state);
+ pageContext.getOut().print("-");
+ }
+ pageContext.getOut().println("start-" + index);
+ } catch (IOException ioe) {
+ throw new JspException(ioe);
+ }
+ }
+ return super.doStartTag();
+ }
+
+ @Override
+ public int doEndTag() throws JspException {
+ ServletRequest request = pageContext.getRequest();
+ boolean throwOnEnd =
Boolean.parseBoolean(request.getParameter("throwOnEnd"));
+ if (throwOnEnd) {
+ state += "lastEndFailed";
+ throw new IllegalSelectorException();
+ } else {
+ try {
+ if (!state.isBlank()) {
same here
Yes, I was on it next ;)
Thanks both.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
