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

[unico]

unico       2004/02/11 06:37:28

  Modified:    src/java/org/apache/cocoon/components/pipeline
                        AbstractProcessingPipeline.java
  Log:
  reverting previous change, getting NPE :-( . sorry for mess up
  
  Revision  Changes    Path
  1.17      +5 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractProcessingPipeline.java   11 Feb 2004 14:00:47 -0000      1.16
  +++ AbstractProcessingPipeline.java   11 Feb 2004 14:37:28 -0000      1.17
  @@ -492,14 +492,15 @@
        */
       public boolean process(Environment environment)
       throws ProcessingException {
  +        
           // If this is an internal request, lastConsumer not the serializer!
  -        if (this.serializer != this.lastConsumer) {
  +        if (null == this.lastConsumer) {
               this.lastConsumer = this.serializer;
           }
  -        if (this.serializer != this.lastConsumer || this.reader != null) {
  +        if (null != this.lastConsumer || this.reader != null) {
               this.preparePipeline(environment);
           }
  -
  +        
           // See if we need to set an "Expires:" header
           if (this.expires != 0) {
               Response res = 
ObjectModelHelper.getResponse(environment.getObjectModel());