You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/12/26 17:42:00 UTC
svn commit: r359074 -
/incubator/roller/trunk/src/org/roller/presentation/velocity/BasePageServlet.java
Author: snoopdave
Date: Mon Dec 26 08:41:57 2005
New Revision: 359074
URL: http://svn.apache.org/viewcvs?rev=359074&view=rev
Log:
Let's make sure we're catching all throwables in the page servlet
Modified:
incubator/roller/trunk/src/org/roller/presentation/velocity/BasePageServlet.java
Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/BasePageServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/BasePageServlet.java?rev=359074&r1=359073&r2=359074&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/BasePageServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/BasePageServlet.java Mon Dec 26 08:41:57 2005
@@ -69,16 +69,14 @@
JspFactory.getDefaultFactory().getPageContext(
this, request, response,"", true, 8192, true);
rreq = RollerRequest.getRollerRequest(pageContext);
- } catch (RollerException e) {
-
+ } catch (Throwable e) {
// An error initializing the request is considered to be a 404
response.sendError(HttpServletResponse.SC_NOT_FOUND);
request.setAttribute("DisplayException", e);
-
+ mLogger.debug("ERROR initializing RollerRequest",e);
return null;
}
-
-
+
// request appears to be valid, lets render
try {
UserManager userMgr = RollerFactory.getRoller().getUserManager();
@@ -140,17 +138,16 @@
outty = findDecorator(website, (String) ctx.get("decorator"));
}
- } catch(ResourceNotFoundException rnfe ) {
-
+ } catch (ResourceNotFoundException rnfe ) {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
request.setAttribute("DisplayException", rnfe);
mLogger.warn("ResourceNotFound: "+ request.getRequestURL());
mLogger.debug(rnfe);
- } catch(Exception e) {
+ } catch (Throwable e) {
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
request.setAttribute("DisplayException", e);
- mLogger.error("Unexpected exception", e);
+ mLogger.error("ERROR preparing for page execution", e);
}
return outty;