You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2002/05/18 01:44:01 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler PageDataImpl.java
kinman 02/05/17 16:44:00
Modified: jasper2/src/share/org/apache/jasper/compiler
PageDataImpl.java
Log:
- Recreate the InputStream in case it is used twice.
Revision Changes Path
1.3 +10 -15 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java
Index: PageDataImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageDataImpl.java 24 Apr 2002 21:12:52 -0000 1.2
+++ PageDataImpl.java 17 May 2002 23:44:00 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v 1.2 2002/04/24 21:12:52 kinman Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/24 21:12:52 $
+ * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v 1.3 2002/05/17 23:44:00 kinman Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/17 23:44:00 $
*
* ====================================================================
*
@@ -101,9 +101,6 @@
// default "xmlns:jsp" and "version" attributes of jsp:root element
private static AttributesImpl defaultJspRootAttrs;
- // input stream of the XML view
- private InputStream is;
-
// string buffer used to build XML view
private StringBuffer buf;
@@ -136,14 +133,6 @@
SecondPassVisitor secondPassVisitor
= new SecondPassVisitor(page.getRoot(), buf);
page.visit(secondPassVisitor);
-
- // Turn StringBuffer into InputStream
- try {
- is = new ByteArrayInputStream(buf.toString().getBytes("UTF-8"));
- } catch (UnsupportedEncodingException uee) {
- // should never happen
- throw new RuntimeException(uee.toString());
- }
}
/**
@@ -152,7 +141,13 @@
* @return the input stream of the XML view
*/
public InputStream getInputStream() {
- return is;
+ // Turn StringBuffer into InputStream
+ try {
+ return new ByteArrayInputStream(buf.toString().getBytes("UTF-8"));
+ } catch (UnsupportedEncodingException uee) {
+ // should never happen
+ throw new RuntimeException(uee.toString());
+ }
}
/*
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>