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

[unico]

unico       2004/02/11 05:59:40

  Modified:    src/java/org/apache/cocoon/components/pipeline
                        AbstractProcessingPipeline.java
  Log:
  fix bug 26186: the assumption that a null value for the lastConsumer 
indicates 
  an internal request is not true. See the two argument process method.
  
  Revision  Changes    Path
  1.15      +6 -4      
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AbstractProcessingPipeline.java   6 Feb 2004 11:37:49 -0000       1.14
  +++ AbstractProcessingPipeline.java   11 Feb 2004 13:59:39 -0000      1.15
  @@ -151,6 +151,8 @@
       
       /** Output Buffer Size */
       protected int  outputBufferSize;
  +    
  +    private boolean internal;
   
       /**
        * Composable Interface
  @@ -492,11 +494,11 @@
        */
       public boolean process(Environment environment)
       throws ProcessingException {
  -        // If this is an internal request, lastConsumer was reset!
  -        if (null == this.lastConsumer) {
  +        // If this is an internal request, lastConsumer not the serializer!
  +        if (this.serializer != this.lastConsumer) {
               this.lastConsumer = this.serializer;
           }
  -        if (null != this.lastConsumer || this.reader != null) {
  +        if (this.serializer != this.lastConsumer || this.reader != null) {
               this.preparePipeline(environment);
           }