cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/pipeline AbstractStreamPipeline.java CachingEventPipeline.java CachingStreamPipeline.java
Date Sun, 05 Aug 2001 16:33:27 GMT
vgritsenko    01/08/05 09:33:27

  Modified:    src/org/apache/cocoon/components/pipeline
                        AbstractStreamPipeline.java
                        CachingEventPipeline.java
                        CachingStreamPipeline.java
  Log:
  Rethrow ProcessingException
  
  Revision  Changes    Path
  1.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractStreamPipeline.java	2001/07/12 10:23:04	1.7
  +++ AbstractStreamPipeline.java	2001/08/05 16:33:27	1.8
  @@ -35,7 +35,7 @@
    * </UL>
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/07/12 10:23:04 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/08/05 16:33:27 $
    */
   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.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CachingEventPipeline.java	2001/07/09 13:19:52	1.15
  +++ CachingEventPipeline.java	2001/08/05 16:33:27	1.16
  @@ -50,7 +50,7 @@
    * does not cache! (If it would cache, the response would be cached twice!)
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.15 $ $Date: 2001/07/09 13:19:52 $
  + * @version CVS $Revision: 1.16 $ $Date: 2001/08/05 16:33:27 $
    */
   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.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CachingStreamPipeline.java	2001/07/12 10:23:06	1.8
  +++ CachingStreamPipeline.java	2001/08/05 16:33:27	1.9
  @@ -45,7 +45,7 @@
    *  </ul>
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.8 $ $Date: 2001/07/12 10:23:06 $
  + * @version CVS $Revision: 1.9 $ $Date: 2001/08/05 16:33:27 $
    */
   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:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message