cziegeler 2002/06/13 03:08:13
Modified: src/java/org/apache/cocoon/components/pipeline/impl
CachingProcessingPipeline.java
Log:
Fixing hang-up when stylesheet or any source changes
Revision Changes Path
1.24 +11 -9
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CachingProcessingPipeline.java 5 Jun 2002 06:32:38 -0000 1.23
+++ CachingProcessingPipeline.java 13 Jun 2002 10:08:13 -0000 1.24
@@ -379,6 +379,7 @@
cachedPipelineKey = processingPipelineKey.copy();
this.firstProcessedTransformerIndex =
this.firstNotCacheableTransformerIndex;
}
+
boolean finished = false;
SourceValidity[] cachedValidityObjects = null;
while (cachedPipelineKey != null && !finished) {
@@ -398,8 +399,8 @@
while (responseIsValid && i < validities.length) {
int valid = validities[i].isValid();
boolean isValid = false;
+ SourceValidity validity = null;
if ( valid == 0) {
- final SourceValidity validity;
if (i == 0) {
// test generator
if (generatorIsCacheableProcessingComponent) {
@@ -427,16 +428,17 @@
if (validity != null) {
isValid = validities[i].isValid( validity );
}
- if ( !isValid ) {
- responseIsValid = false;
- // update validity
- validities[i] = validity;
- if (validity == null) responseIsUsable = false;
- }
} else {
isValid = (valid == 1);
}
- if ( isValid ) i++;
+ if ( !isValid ) {
+ responseIsValid = false;
+ // update validity
+ validities[i] = validity;
+ if (validity == null) responseIsUsable = false;
+ } else {
+ i++;
+ }
}
if ( responseIsValid ) {
// we are valid, ok that's it
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
