bloritsch 01/06/08 09:44:41
Modified: src/org/apache/cocoon/components/pipeline Tag:
cocoon_20_branch AbstractStreamPipeline.java
CachingStreamPipeline.java
Log:
correct my reapplication of StreamPipelines
Revision Changes Path
No revision
No revision
1.3.2.4 +9 -4
xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java
Index: AbstractStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- AbstractStreamPipeline.java 2001/06/08 15:02:17 1.3.2.3
+++ AbstractStreamPipeline.java 2001/06/08 16:44:38 1.3.2.4
@@ -34,7 +34,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/06/08 15:02:17 $
+ * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/06/08 16:44:38 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable implements
StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -115,7 +115,7 @@
}
public boolean process(Environment environment)
- throws Exception {
+ throws ProcessingException {
if ( this.reader != null ) {
return processReader(environment);
} else {
@@ -129,10 +129,15 @@
// execute the pipeline:
try {
this.eventPipeline.process(environment);
- } catch ( Exception e ) {
+ } catch ( ProcessingException e ) {
throw e;
+ } catch ( Exception e ) {
+ getLogger().debug("Exception in process", e);
+ throw new ProcessingException(
+ "Failed to execute pipeline.",
+ e
+ );
}
-
return true;
}
}
1.3.2.4 +10 -3
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- CachingStreamPipeline.java 2001/06/08 15:02:18 1.3.2.3
+++ CachingStreamPipeline.java 2001/06/08 16:44:40 1.3.2.4
@@ -45,7 +45,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/06/08 15:02:18 $
+ * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/06/08 16:44:40 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -241,7 +241,7 @@
* Process the request.
*/
public boolean process(Environment environment)
- throws Exception {
+ throws ProcessingException {
if ( super.reader != null ) {
return super.process(environment);
} else {
@@ -354,9 +354,16 @@
}
- } catch ( Exception e ) {
+ } catch ( ProcessingException e ) {
throw e;
+ } catch ( Exception e ) {
+ getLogger().debug("Exception in process", e);
+ throw new ProcessingException(
+ "Failed to execute pipeline.",
+ e
+ );
}
+
return true;
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
