luehe 2002/07/16 15:39:20
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Fixed infinite loop in fragment generation for <jsp:body>.
Revision Changes Path
1.38 +7 -10
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Generator.java 16 Jul 2002 20:40:11 -0000 1.37
+++ Generator.java 16 Jul 2002 22:39:20 -0000 1.38
@@ -1689,10 +1689,7 @@
out.print(attributeValue(value, false, JspFragment.class,
"null" ));
} else {
- // Parent node must be a CustomTag since
- // isSimpleTagHandler is set to true.
- generateJspFragment((Node.CustomTag)n.getParent(),
- simpleTagHandlerVar);
+ generateJspFragment(n, simpleTagHandlerVar);
}
out.println(");");
} else {
@@ -2377,7 +2374,7 @@
* Generates anonymous JspFragment inner class which is passed as an
* argument to SimpleTag.setJspBody().
*/
- private void generateJspFragment(Node parent, String tagHandlerVar)
+ private void generateJspFragment(Node n, String tagHandlerVar)
throws JasperException
{
// XXX - A possible optimization here would be to check to see
@@ -2387,10 +2384,10 @@
// body. The implementation of this fragment can come from
// the org.apache.jasper.runtime package as a support class.
int id = helperClassBuffer.getFragmentId();
- helperClassBuffer.openFragment( parent );
+ helperClassBuffer.openFragment( n );
ServletWriter outSave = out;
out = helperClassBuffer.getOut();
- visitBody( parent );
+ visitBody( n );
out = outSave;
helperClassBuffer.closeFragment();
// XXX - Need to change pageContext to jspContext if
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
