vgritsenko 01/07/02 13:50:46
Modified: src/org/apache/cocoon/generation ServerPagesGenerator.java
src/org/apache/cocoon/sitemap Handler.java
Log:
Deliver compilation errors from compiler to browser
Revision Changes Path
1.10 +3 -1
xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ServerPagesGenerator.java 2001/06/12 20:02:49 1.9
+++ ServerPagesGenerator.java 2001/07/02 20:50:43 1.10
@@ -48,7 +48,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/06/12 20:02:49 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/07/02 20:50:43 $
*/
public class ServerPagesGenerator
extends ServletGenerator
@@ -152,6 +152,8 @@
try {
generator = (XSPGenerator)
programGenerator.load(this.manager, super.source, this.markupLanguage,
this.programmingLanguage, this.resolver);
+ } catch (ProcessingException e) {
+ throw e;
} catch (Exception e) {
getLogger().warn("ServerPagesGenerator.generate()", e);
throw new ResourceNotFoundException(e.getMessage(), e);
1.12 +5 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Handler.java 2001/06/28 09:56:45 1.11
+++ Handler.java 2001/07/02 20:50:45 1.12
@@ -39,7 +39,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/06/28 09:56:45 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/07/02 20:50:45 $
*/
public class Handler extends AbstractLoggable implements Runnable, Configurable,
Composable,
Contextualizable, Processor, Disposable {
@@ -246,7 +246,10 @@
public void throwEventualException() throws Exception {
if (this.exception != null) {
- throw new ProcessingException("Exception in Handler",
this.exception);
+ if(this.exception instanceof ProcessingException)
+ throw this.exception;
+ else
+ throw new ProcessingException("Exception in Handler",
this.exception);
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
