remm 02/03/31 01:02:52
Modified: jasper2/src/share/org/apache/jasper/runtime
JspWriterImpl.java PageContextImpl.java
Log:
- Writer recycling seems to be working after a few minor tweaks. If it causes
problems, the "out = null;" line can be uncommented.
Revision Changes Path
1.2 +11 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java
Index: JspWriterImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspWriterImpl.java 28 Mar 2002 18:46:19 -0000 1.1
+++ JspWriterImpl.java 31 Mar 2002 09:02:52 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
1.1 2002/03/28 18:46:19 kinman Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/28 18:46:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
1.2 2002/03/31 09:02:52 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/31 09:02:52 $
*
* ====================================================================
*
@@ -142,6 +142,15 @@
this.bufferSize=sz;
}
+ /** Package-level access
+ */
+ void recycle() {
+ flushed = false;
+ closed = false;
+ out = null;
+ nextChar = 0;
+ }
+
/**
* Flush the output buffer to the underlying character stream, without
* flushing the stream itself. This method is non-private only so that it
@@ -647,10 +656,4 @@
}
}
- /** Package-level access
- */
- void recycle() {
- flushed = false;
- nextChar = 0;
- }
}
1.2 +6 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageContextImpl.java 28 Mar 2002 18:46:20 -0000 1.1
+++ PageContextImpl.java 31 Mar 2002 09:02:52 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.1 2002/03/28 18:46:20 kinman Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/28 18:46:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.2 2002/03/31 09:02:52 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/31 09:02:52 $
*
* ====================================================================
*
@@ -144,8 +144,9 @@
// System.out.println("Initialize PageContextImpl " + out );
if( out == null ) {
out = _createOut(bufferSize, autoFlush); // throws
- } else
- ((JspWriterImpl)out).init(response, bufferSize, autoFlush );
+ } else {
+ ((JspWriterImpl)out).init(response, bufferSize, autoFlush );
+ }
if (this.out == null)
throw new IllegalStateException("failed initialize JspWriter");
@@ -188,8 +189,7 @@
autoFlush = true;
request = null;
response = null;
- // Reuse // XXX problems - need to fix them first!!
- out = null; // out is closed elsewhere
+ //out = null;
if( out instanceof JspWriterImpl )
((JspWriterImpl)out).recycle();
session = null;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
