cziegeler 2004/01/30 01:45:39
Modified: . status.xml
src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
Log:
<action dev="CZ" type="fix" fixes-bug="26186" due-to-email="[EMAIL
PROTECTED]" due-to="Michael Gerzabek">
Fixing memory leak in the cocoon protocol.
</action>
Revision Changes Path
1.232 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- status.xml 29 Jan 2004 10:41:12 -0000 1.231
+++ status.xml 30 Jan 2004 09:45:39 -0000 1.232
@@ -196,6 +196,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix" fixes-bug="26186" due-to-email="[EMAIL
PROTECTED]" due-to="Michael Gerzabek">
+ Fixing memory leak in the cocoon protocol.
+ </action>
<action dev="JH" type="add" fixes-bug="14327" due-to="Marco Rolappe"
due-to-email="[EMAIL PROTECTED]">
JSPReader: The output encoding of the reader is now configurable.
</action>
1.11 +3 -2
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractProcessingPipeline.java 31 Oct 2003 10:31:28 -0000 1.10
+++ AbstractProcessingPipeline.java 30 Jan 2004 09:45:39 -0000 1.11
@@ -475,8 +475,9 @@
// If this is an internal request, lastConsumer was reset!
if (null == this.lastConsumer) {
this.lastConsumer = this.serializer;
+ } else {
+ this.preparePipeline(environment);
}
- this.preparePipeline(environment);
// See if we need to set an "Expires:" header
if (this.expires != 0) {
