vgritsenko 01/08/05 09:34:48
Modified: src/org/apache/cocoon/components/pipeline Tag:
cocoon_20_branch AbstractStreamPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java
Log:
Rethrow ProcessingException
Revision Changes Path
No revision
No revision
1.3.2.7 +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.6
retrieving revision 1.3.2.7
diff -u -r1.3.2.6 -r1.3.2.7
--- AbstractStreamPipeline.java 2001/07/12 10:29:37 1.3.2.6
+++ AbstractStreamPipeline.java 2001/08/05 16:34:47 1.3.2.7
@@ -35,7 +35,7 @@
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/07/12 10:29:37 $
+ * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/05 16:34:47 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable implements
StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -194,6 +194,8 @@
this.reader.setOutputStream(environment.getOutputStream());
this.reader.generate();
}
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
throw new ProcessingException("Error reading resource",e);
}
1.7.2.10 +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.9
retrieving revision 1.7.2.10
diff -u -r1.7.2.9 -r1.7.2.10
--- CachingEventPipeline.java 2001/07/10 14:04:35 1.7.2.9
+++ CachingEventPipeline.java 2001/08/05 16:34:48 1.7.2.10
@@ -50,7 +50,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.9 $ $Date: 2001/07/10 14:04:35 $
+ * @version CVS $Revision: 1.7.2.10 $ $Date: 2001/08/05 16:34:48 $
*/
public class CachingEventPipeline
extends AbstractEventPipeline
@@ -185,6 +185,8 @@
null);
// execute the pipeline:
deserializer.deserialize(cachedObject.getSAXFragment());
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
throw new ProcessingException(
"Failed to execute pipeline.",
1.3.2.8 +3 -2
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.7
retrieving revision 1.3.2.8
diff -u -r1.3.2.7 -r1.3.2.8
--- CachingStreamPipeline.java 2001/07/12 10:29:38 1.3.2.7
+++ CachingStreamPipeline.java 2001/08/05 16:34:48 1.3.2.8
@@ -45,7 +45,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/07/12 10:29:38 $
+ * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/08/05 16:34:48 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -231,6 +231,8 @@
se
);
}
+ } catch ( ProcessingException e ) {
+ throw e;
} catch ( Exception e ) {
getLogger().debug("IOException in ProcessReader", e);
@@ -369,7 +371,6 @@
this.streamCache.store(pcKey,
new CachedStreamObject(validityObjects, bytes));
}
-
}
} catch ( ProcessingException e ) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
