[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xml-cocoon-cvs
Subject:    svn commit: r882882 -
From:       reinhard () apache ! org
Date:       2009-11-21 10:57:57
Message-ID: 20091121105757.3552023888C5 () eris ! apache ! org
[Download RAW message or body]

Author: reinhard
Date: Sat Nov 21 10:57:56 2009
New Revision: 882882

URL: http://svn.apache.org/viewvc?rev=882882&view=rev
Log:
create the cachekey as last step of the pipeline setup phase

Modified:
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java


Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java
                
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/o \
rg/apache/cocoon/pipeline/CachingPipeline.java?rev=882882&r1=882881&r2=882882&view=diff
 ==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java \
                (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java \
Sat Nov 21 10:57:56 2009 @@ -109,7 +109,6 @@
             this.logger.debug("Used cache: " + this.cache);
         }
 
-        this.cacheKey = this.constructCacheKey();
         // checked for a cached value first
         CacheValue cachedValue = this.getCachedValue(this.cacheKey);
         if (this.isCacheKeyValid(cachedValue)) {
@@ -139,6 +138,7 @@
         if (this.cacheKey == null) {
             return -1;
         }
+
         return this.cacheKey.getLastModified();
     }
 
@@ -174,6 +174,8 @@
         this.cachingOutputStream = new CachingOutputStream(outputStream);
 
         super.setup(this.cachingOutputStream, parameters);
+
+        this.cacheKey = this.constructCacheKey();
     }
 
     protected CacheValue getCachedValue(CacheKey cacheKey) {


[prev in list] [next in list] [prev in thread] [next in thread]