You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2007/12/19 16:59:14 UTC
svn commit: r605597 -
/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
Author: fmeschbe
Date: Wed Dec 19 07:59:14 2007
New Revision: 605597
URL: http://svn.apache.org/viewvc?rev=605597&view=rev
Log:
Enhance default error handling code by printing the servlet name if available
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java?rev=605597&r1=605596&r2=605597&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java Wed Dec 19 07:59:14 2007
@@ -19,6 +19,7 @@
package org.apache.sling.core.impl;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static org.apache.sling.api.SlingConstants.ERROR_REQUEST_URI;
import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
import java.io.IOException;
@@ -304,6 +305,13 @@
+ status + message);
} else {
+ // error situation
+ String servletName = (String) request.getAttribute(ERROR_SERVLET_NAME);
+ String requestURI = (String) request.getAttribute(ERROR_REQUEST_URI);
+ if (requestURI == null) {
+ requestURI = request.getRequestURI();
+ }
+
// reset anything in the response first
response.reset();
@@ -317,7 +325,10 @@
pw.println("</title></head><body><h1>");
pw.println("HTTP ERROR:" + message);
pw.println("</h1><p>");
- pw.println("RequestURI=" + request.getRequestURI());
+ pw.println("RequestURI=" + requestURI);
+ if (servletName != null) {
+ pw.println("</p>Servlet=" + servletName + "<p>");
+ }
pw.println("</p><hr /><address>");
pw.println(getServerInfo());
pw.println("</address></body></html>");
@@ -338,6 +349,13 @@
throwable);
} else {
+ // error situation
+ String servletName = (String) request.getAttribute(ERROR_SERVLET_NAME);
+ String requestURI = (String) request.getAttribute(ERROR_REQUEST_URI);
+ if (requestURI == null) {
+ requestURI = request.getRequestURI();
+ }
+
// reset anything in the response first
response.reset();
@@ -352,6 +370,9 @@
pw.println(throwable.toString());
pw.println("</h1><p>");
pw.println("RequestURI=" + request.getRequestURI());
+ if (servletName != null) {
+ pw.println("</p>Servlet=" + servletName + "<p>");
+ }
pw.println("</p><pre>");
throwable.printStackTrace(pw);
pw.println("</pre><hr /><address>");