cziegeler 2003/01/15 00:06:37
Modified: src/java/org/apache/cocoon/components/pipeline/impl
AbstractCachingProcessingPipeline.java
src/java/org/apache/cocoon/sitemap ContentAggregator.java
Log:
Disabling deferred validities for the moment
Revision Changes Path
1.20 +5 -4
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractCachingProcessingPipeline.java 14 Jan 2003 06:59:52 -0000 1.19
+++ AbstractCachingProcessingPipeline.java 15 Jan 2003 08:06:36 -0000 1.20
@@ -63,7 +63,7 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.transformation.Transformer;
import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.DeferredAggregatedValidity;
+import org.apache.excalibur.source.impl.validity.AggregatedValidity;
import org.apache.excalibur.source.impl.validity.DeferredValidity;
import java.io.ByteArrayOutputStream;
@@ -774,9 +774,10 @@
public SourceValidity getValidityForEventPipeline() {
if (!this.completeResponseIsCached
&& this.firstNotCacheableTransformerIndex ==
super.transformers.size()) {
- DeferredAggregatedValidity validity = new DeferredAggregatedValidity();
+ AggregatedValidity validity = new AggregatedValidity();
for(int i=0; i < this.toCacheKey.size(); i++) {
- validity.add(new DeferredPipelineValidity(this, i));
+ validity.add(this.getValidityForInternalPipeline(i));
+ //validity.add(new DeferredPipelineValidity(this, i));
}
return validity;
}
1.11 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ContentAggregator.java 10 Jan 2003 14:19:45 -0000 1.10
+++ ContentAggregator.java 15 Jan 2003 08:06:37 -0000 1.11
@@ -62,7 +62,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.DeferredAggregatedValidity;
+import org.apache.excalibur.source.impl.validity.AggregatedValidity;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -210,7 +210,7 @@
*/
public SourceValidity generateValidity() {
try {
- DeferredAggregatedValidity v = new DeferredAggregatedValidity();
+ AggregatedValidity v = new AggregatedValidity();
Source current;
for (int i = 0; i < this.parts.size(); i++) {
current = ((Part)this.parts.get(i)).source;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
