vgritsenko 01/08/05 09:40:31
Modified: src/org/apache/cocoon/generation HTMLGenerator.java
JspGenerator.java VelocityGenerator.java
Log:
Rethrow ProcessingException
Revision Changes Path
1.8 +3 -1 xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HTMLGenerator.java 2001/07/13 20:02:08 1.7
+++ HTMLGenerator.java 2001/08/05 16:40:31 1.8
@@ -45,7 +45,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/07/13 20:02:08 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/08/05 16:40:31 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable {
@@ -147,6 +147,8 @@
} catch (SAXException e){
getLogger().error("HTMLGenerator.generate()", e);
throw(e);
+ } catch (ProcessingException e){
+ throw e;
} catch (Exception e){
getLogger().error("Could not setup jtidy", e);
throw new ProcessingException("Exception in
HTMLGenerator.generate()",e);
1.14 +3 -1 xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JspGenerator.java 2001/07/16 14:27:42 1.13
+++ JspGenerator.java 2001/08/05 16:40:31 1.14
@@ -36,7 +36,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.13 $ $Date: 2001/07/16 14:27:42 $
+ * @version CVS $Revision: 1.14 $ $Date: 2001/08/05 16:40:31 $
*/
public class JspGenerator extends ServletGenerator implements Recyclable,
Configurable {
@@ -91,6 +91,8 @@
} catch (IOException e) {
getLogger().debug("IOException in JspGenerator.generate()", e);
throw new ProcessingException("IOException JspGenerator.generate()",e);
+ } catch (ProcessingException e) {
+ throw e;
} catch (Exception e) {
getLogger().debug("Exception in JspGenerator.generate()", e);
throw new ProcessingException("Exception JspGenerator.generate()",e);
1.6 +3 -1
xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityGenerator.java 2001/07/07 11:43:30 1.5
+++ VelocityGenerator.java 2001/08/05 16:40:31 1.6
@@ -25,7 +25,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/07/07 11:43:30 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/08/05 16:40:31 $
*/
public class VelocityGenerator extends ServletGenerator implements Recyclable {
@@ -81,6 +81,8 @@
} catch (ComponentException e){
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
VelocityGenerator.generate()",e);
+ } catch (ProcessingException e){
+ throw e;
} catch (Exception e){
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
VelocityGenerator.generate()",e);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
