kinman 2003/08/17 14:54:36
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- The "out" in the Fragment helper functions is now JspWriter instead of
java.io.Writer, so that it won't trigger errors when a fragment contains
include actions.
Revision Changes Path
1.196 +5 -5
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.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- Generator.java 14 Aug 2003 21:16:52 -0000 1.195
+++ Generator.java 17 Aug 2003 21:54:36 -0000 1.196
@@ -3515,7 +3515,7 @@
} else {
out.printin("public void invoke");
}
- out.println(result.getId() + "( " + "java.io.Writer out ) " );
+ out.println(result.getId() + "( " + "JspWriter out ) " );
out.pushIndent();
// Note: Throwable required because methods like _jspx_meth_*
// throw Throwable.
@@ -3558,7 +3558,7 @@
out.popIndent();
out.printil( "{" );
out.pushIndent();
- out.printil( "java.io.Writer out = null;" );
+ out.printil( "JspWriter out = null;" );
out.printil( "if( writer != null ) {" );
out.pushIndent();
out.printil( "out = this.jspContext.pushBody(writer);" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
