cziegeler    2003/01/27 23:23:35

  Modified:    src/java/org/apache/cocoon/components/pipeline/impl
                        AbstractCachingProcessingPipeline.java
  Log:
  First fix for 16248 - need some more investigation
  
  Revision  Changes    Path
  1.23      +13 -14    
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
  
  Index: AbstractCachingProcessingPipeline.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- AbstractCachingProcessingPipeline.java    15 Jan 2003 12:28:17 -0000      1.22
  +++ AbstractCachingProcessingPipeline.java    28 Jan 2003 07:23:35 -0000      1.23
  @@ -463,19 +463,6 @@
                       }
                       // we are not valid!
   
  -                    // try a shorter key
  -                    if (i > 0) {
  -                        this.fromCacheKey.removeLastKey();
  -                        if (!this.completeResponseIsCached) {
  -                            this.firstProcessedTransformerIndex--;
  -                        }
  -                    } else {
  -                        this.fromCacheKey = null;
  -                    }
  -
  -                    this.completeResponseIsCached = false;
  -                    finished = false;
  -
                       if (!responseIsUsable) {
                           // we could not compare, because we got no
                           // validity object, so shorten pipeline key
  @@ -496,6 +483,18 @@
                           // the entry is invalid, remove it
                           this.cache.remove( this.fromCacheKey );
                       }
  +
  +                    // try a shorter key
  +                    if (i > 0) {
  +                        this.fromCacheKey.removeLastKey();
  +                        if (!this.completeResponseIsCached) {
  +                            this.firstProcessedTransformerIndex--;
  +                        }
  +                    } else {
  +                        this.fromCacheKey = null;
  +                    }
  +
  +                    this.completeResponseIsCached = false;
                   }
               } else {
                   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to