dims 02/02/23 13:15:46
Modified: src/java/org/apache/cocoon/servlet CocoonServlet.java
src/java/org/apache/cocoon/sitemap Handler.java
Log:
- Add stacktrace to the error screen.
- Fix Handler code to rethrow Throwable's (that are not Exceptions) as
ProcessingExceptions.
Revision Changes Path
1.13 +10 -2
xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CocoonServlet.java 22 Feb 2002 07:03:55 -0000 1.12
+++ CocoonServlet.java 23 Feb 2002 21:15:45 -0000 1.13
@@ -95,6 +95,8 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.FileOutputStream;
+import java.io.StringWriter;
+import java.io.PrintWriter;
import java.lang.reflect.Constructor;
import java.net.URL;
import java.util.Arrays;
@@ -116,7 +118,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Id: CocoonServlet.java,v 1.12 2002/02/22 07:03:55 cziegeler Exp $
+ * @version CVS $Id: CocoonServlet.java,v 1.13 2002/02/23 21:15:45 dims Exp $
*/
public class CocoonServlet extends HttpServlet {
@@ -992,6 +994,9 @@
+ "\" was not found.");
n.addExtraDescription("request-uri", request.getRequestURI());
n.addExtraDescription("path-info", uri);
+ StringWriter writer = new StringWriter();
+ rse.printStackTrace(new PrintWriter(writer));
+ n.addExtraDescription("stack-trace",writer.toString());
// send the notification but don't include it in the output stream
// as the status SC_NOT_FOUND is enough
res.setContentType(Notifier.notify(n, (OutputStream)null));
@@ -1020,9 +1025,12 @@
}
//res.setStatus(res.SC_INTERNAL_SERVER_ERROR);
- HashMap extraDescriptions = new HashMap(2);
+ HashMap extraDescriptions = new HashMap(3);
extraDescriptions.put("request-uri", request.getRequestURI());
extraDescriptions.put("path-info", uri);
+ StringWriter writer = new StringWriter();
+ e.printStackTrace(new PrintWriter(writer));
+ extraDescriptions.put("stack-trace",writer.toString());
Notifying n=new DefaultNotifyingBuilder().build(
this, e, "fatal","Internal server error","Cocoon
servlet",null,null,extraDescriptions);
1.12 +3 -1 xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Handler.java 22 Feb 2002 07:03:55 -0000 1.11
+++ Handler.java 23 Feb 2002 21:15:46 -0000 1.12
@@ -84,7 +84,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 $Id: Handler.java,v 1.11 2002/02/22 07:03:55 cziegeler Exp $
+ * @version CVS $Id: Handler.java,v 1.12 2002/02/23 21:15:46 dims Exp $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
@@ -291,6 +291,8 @@
getLogger().error("Error compiling sitemap", t);
if (t instanceof Exception) {
this.exception = (Exception)t;
+ } else {
+ this.exception = new ProcessingException("Error compiling
sitemap",t);
}
} finally {
this.manager.release(programGenerator);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
