Remy Maucherat wrote:
I would like comments on bug 17049 before deciding what to do with 4.1.20.

If this turns out to be a relatively minor issue, I would be ok with releasing 4.1.20 as a beta, and would propose a vote.

For 4.1.21, there are apparently some patches for better taglib handling to be integrated in JspC. Other than that, it looks good enough to me.
This is a serious bug in Jasper, and I think may have been introduced by Jan's commit attached here.

I will try to find time to look into the issue.

Remy

luehe 2003/01/16 17:21:06

Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
Log:
Fixed 16181: JspWriter not restored properly when exception thrown in a tag's body content

Revision Changes Path
No revision


No revision


1.35.2.17 +12 -12 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java

Index: Generator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.35.2.16
retrieving revision 1.35.2.17
diff -u -r1.35.2.16 -r1.35.2.17
--- Generator.java 17 Jan 2003 00:51:23 -0000 1.35.2.16
+++ Generator.java 17 Jan 2003 01:21:06 -0000 1.35.2.17
@@ -545,7 +545,7 @@

private Hashtable tagVarNumbers;
private String parent;
- private String pushBodyCount;
+ private String pushBodyCountVar;

private ServletWriter out;
private MethodsBuffer methodsBuffer;
@@ -1177,17 +1177,17 @@

String tmpParent = parent;
parent = tagHandlerVar;
- String tmpPushBodyCount = null;
+ String tmpPushBodyCountVar = null;
if (n.implementsTryCatchFinally()) {
- tmpPushBodyCount = pushBodyCount;
- pushBodyCount = tagPushBodyCountVar;
+ tmpPushBodyCountVar = pushBodyCountVar;
+ pushBodyCountVar = tagPushBodyCountVar;
}

visitBody(n);

parent = tmpParent;
if (n.implementsTryCatchFinally()) {
- pushBodyCount = tmpPushBodyCount;
+ pushBodyCountVar = tmpPushBodyCountVar;
}

generateCustomEnd(n, tagHandlerVar, tagEvalVar,
@@ -1390,8 +1390,8 @@
if (n.implementsTryCatchFinally()) {
out.printin(tagPushBodyCountVar);
out.println("++;");
- } else if (pushBodyCount != null) {
- out.printin(pushBodyCount);
+ } else if (pushBodyCountVar != null) {
+ out.printin(pushBodyCountVar);
out.println("++;");
}
out.printil("out = _bc;");
@@ -1458,8 +1458,8 @@
if (n.implementsTryCatchFinally()) {
out.printin(tagPushBodyCountVar);
out.println("--;");
- } else if (pushBodyCount != null) {
- out.printin(pushBodyCount);
+ } else if (pushBodyCountVar != null) {
+ out.printin(pushBodyCountVar);
out.println("--;");
}
out.popIndent();


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to