cziegeler 2003/01/15 04:28:17
Modified: src/java/org/apache/cocoon/components/pipeline/impl
AbstractCachingProcessingPipeline.java
CachingProcessingPipeline.java
Log:
Fixing NPE in caching algorithm
Revision Changes Path
1.22 +5 -1
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AbstractCachingProcessingPipeline.java 15 Jan 2003 11:52:33 -0000 1.21
+++ AbstractCachingProcessingPipeline.java 15 Jan 2003 12:28:17 -0000 1.22
@@ -586,6 +586,10 @@
}
i++;
}
+ } else {
+ // we don't have to cache
+ this.toCacheKey = null;
+ this.cacheCompleteResponse = false;
}
}
}
1.33 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
Index: CachingProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CachingProcessingPipeline.java 15 Jan 2003 12:04:51 -0000 1.32
+++ CachingProcessingPipeline.java 15 Jan 2003 12:28:17 -0000 1.33
@@ -81,10 +81,6 @@
*/
protected void cacheResults(Environment environment, OutputStream os) throws
Exception {
if (this.toCacheKey != null) {
- if (this.toCacheSourceValidities == null) {
- getLogger().warn("CACHING-ERROR: Cache key is not
null:"+this.toCacheKey+"\nbut sourcevalidities!");
- return;
- }
if ( this.cacheCompleteResponse ) {
CachedResponse response = new
CachedResponse(this.toCacheSourceValidities,
((CachingOutputStream)os).getContent());
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
