giacomo 01/06/08 12:49:49
Modified: src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
AbstractStreamPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java
Log:
Added patch to pipeline components to simply rethrow ProcessingExceptions
Submitted by: Vadim Gritsenko <[EMAIL PROTECTED]>
Revision Changes Path
1.6 +3 -1
xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- AbstractEventPipeline.java 2001/05/31 17:38:06 1.5
+++ AbstractEventPipeline.java 2001/06/08 19:49:47 1.6
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/05/31 17:38:06 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/06/08 19:49:47 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -123,6 +123,8 @@
// execute the pipeline:
try {
this.generator.generate();
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
throw new ProcessingException(
"Failed to execute pipeline.",
1.4 +3 -1
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
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- AbstractStreamPipeline.java 2001/05/31 17:38:07 1.3
+++ AbstractStreamPipeline.java 2001/06/08 19:49:48 1.4
@@ -34,7 +34,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:38:07 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/06/08 19:49:48 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable implements
StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -129,6 +129,8 @@
// execute the pipeline:
try {
this.eventPipeline.process(environment);
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
throw new ProcessingException(
"Failed to execute pipeline.",
1.8 +3 -1
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- CachingEventPipeline.java 2001/05/31 17:38:07 1.7
+++ CachingEventPipeline.java 2001/06/08 19:49:48 1.8
@@ -52,7 +52,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 $Revision: 1.7 $ $Date: 2001/05/31 17:38:07 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/06/08 19:49:48 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -224,6 +224,8 @@
new CachedEventObject(this.validityObjects,
xmlSerializer.getSAXFragment()));
}
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
throw new ProcessingException(
"Failed to execute pipeline.",
1.4 +3 -1
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
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- CachingStreamPipeline.java 2001/05/22 14:35:33 1.3
+++ CachingStreamPipeline.java 2001/06/08 19:49:48 1.4
@@ -45,7 +45,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/22 14:35:33 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/06/08 19:49:48 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -354,6 +354,8 @@
}
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
getLogger().debug("Exception in process", e);
throw new ProcessingException(
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
