cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java

[cziegeler]

cziegeler    2004/02/11 07:59:02

  Modified:    src/java/org/apache/cocoon/components/pipeline
                        AbstractProcessingPipeline.java
  Log:
  fix bug 26186
  
  Revision  Changes    Path
  1.30      +5 -3      
cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
  
  Index: AbstractProcessingPipeline.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AbstractProcessingPipeline.java   6 Feb 2004 11:42:46 -0000       1.29
  +++ AbstractProcessingPipeline.java   11 Feb 2004 15:59:02 -0000      1.30
  @@ -430,9 +430,11 @@
           // 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