giacomo 01/06/07 13:30:37
Modified: src/org/apache/cocoon/components/pipeline Tag:
cocoon_20_branch AbstractEventPipeline.java
AbstractStreamPipeline.java
CachingStreamPipeline.java
CachingEventPipeline.java
Log:
Added patch to pipeline components to simply rethrow ProcessingExceptions
Submitted by: Vadim Gritsenko <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.5.2.2 +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.2.1
retrieving revision 1.5.2.2
diff -u -u -r1.5.2.1 -r1.5.2.2
--- AbstractEventPipeline.java 2001/06/07 16:23:44 1.5.2.1
+++ AbstractEventPipeline.java 2001/06/07 20:30:31 1.5.2.2
@@ -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.2.1 $ $Date: 2001/06/07 16:23:44 $
+ * @version CVS $Revision: 1.5.2.2 $ $Date: 2001/06/07 20:30:31 $
*/
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.3.2.2 +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.2.1
retrieving revision 1.3.2.2
diff -u -u -r1.3.2.1 -r1.3.2.2
--- AbstractStreamPipeline.java 2001/06/07 16:23:46 1.3.2.1
+++ AbstractStreamPipeline.java 2001/06/07 20:30:32 1.3.2.2
@@ -34,7 +34,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/06/07 16:23:46 $
+ * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/06/07 20:30:32 $
*/
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.3.2.2 +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.2.1
retrieving revision 1.3.2.2
diff -u -u -r1.3.2.1 -r1.3.2.2
--- CachingStreamPipeline.java 2001/06/07 16:23:48 1.3.2.1
+++ CachingStreamPipeline.java 2001/06/07 20:30:33 1.3.2.2
@@ -45,7 +45,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/06/07 16:23:48 $
+ * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/06/07 20:30:33 $
*/
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(
1.7.2.2 +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.2.1
retrieving revision 1.7.2.2
diff -u -u -r1.7.2.1 -r1.7.2.2
--- CachingEventPipeline.java 2001/06/07 16:23:47 1.7.2.1
+++ CachingEventPipeline.java 2001/06/07 20:30:33 1.7.2.2
@@ -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.2.1 $ $Date: 2001/06/07 16:23:47 $
+ * @version CVS $Revision: 1.7.2.2 $ $Date: 2001/06/07 20:30:33 $
*/
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.",
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
