vgritsenko 02/04/06 09:57:54
Modified: src/java/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
CachingEventPipeline.java
Log:
nitpicking...
Revision Changes Path
1.9 +3 -7
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractEventPipeline.java 25 Mar 2002 12:38:33 -0000 1.8
+++ AbstractEventPipeline.java 6 Apr 2002 17:57:54 -0000 1.9
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Royal</a>
- * @version CVS $Id: AbstractEventPipeline.java,v 1.8 2002/03/25 12:38:33 cziegeler
Exp $
+ * @version CVS $Id: AbstractEventPipeline.java,v 1.9 2002/04/06 17:57:54
vgritsenko Exp $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -154,7 +154,7 @@
}
public boolean process(Environment environment) throws Exception {
- if ( !checkPipeline() ) {
+ if (!checkPipeline()) {
throw new ProcessingException("Attempted to process incomplete
pipeline.");
}
@@ -230,8 +230,6 @@
e
);
}
-
-
}
/** Connect the pipeline.
@@ -294,7 +292,7 @@
try {
// Release generator.
- if ( generatorSelector != null ) {
+ if (generatorSelector != null) {
generatorSelector.release(this.generator);
}
@@ -318,7 +316,6 @@
e
);
} finally {
-
// FIXME : in theory selectors should be released on their respective
managers
// but this causes no harm since they're ThreadSafe
this.generatorSelector = null;
@@ -336,4 +333,3 @@
// Nothing here
}
}
-
1.9 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CachingEventPipeline.java 22 Feb 2002 07:00:11 -0000 1.8
+++ CachingEventPipeline.java 6 Apr 2002 17:57:54 -0000 1.9
@@ -52,7 +52,6 @@
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
@@ -84,7 +83,7 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CachingEventPipeline.java,v 1.8 2002/02/22 07:00:11 cziegeler
Exp $
+ * @version CVS $Id: CachingEventPipeline.java,v 1.9 2002/04/06 17:57:54 vgritsenko
Exp $
*/
public class CachingEventPipeline
extends AbstractEventPipeline
@@ -282,7 +281,6 @@
// is the generator cacheable?
if (this.generator instanceof Cacheable) {
-
long key = ((Cacheable)this.generator).generateKey();
CacheValidity validity = ((Cacheable)this.generator).generateValidity();
@@ -324,12 +322,14 @@
} else {
testTrans = false;
}
- if (testTrans)
+ if (testTrans) {
this.firstNotCacheableTransformerIndex++;
+ }
}
// all transformers are cacheable => pipeline is cacheable
- if (this.firstNotCacheableTransformerIndex == transformerSize)
+ if (this.firstNotCacheableTransformerIndex == transformerSize) {
this.cacheable = true;
+ }
}
}
this.setupFinished = true;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
