cziegeler 2004/02/11 06:53:15
Modified: src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
Log:
I think this should really fix the bug 26186 now. Is this correct?
Revision Changes Path
1.18 +6 -5
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractProcessingPipeline.java 11 Feb 2004 14:37:28 -0000 1.17
+++ AbstractProcessingPipeline.java 11 Feb 2004 14:53:15 -0000 1.18
@@ -492,13 +492,14 @@
*/
public boolean process(Environment environment)
throws ProcessingException {
-
- // If this is an internal request, lastConsumer not the serializer!
+ // If this is an internal request, lastConsumer was reset!
if (null == this.lastConsumer) {
this.lastConsumer = this.serializer;
- }
- if (null != this.lastConsumer || this.reader != null) {
+ } else {
this.preparePipeline(environment);
+ }
+ if ( this.reader != null ) {
+ this.preparePipeline(environment);
}
// See if we need to set an "Expires:" header
