You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2005/12/06 01:29:53 UTC
svn commit: r354242 -
/incubator/roller/trunk/src/org/roller/presentation/velocity/FlavorServlet.java
Author: agilliland
Date: Mon Dec 5 16:29:49 2005
New Revision: 354242
URL: http://svn.apache.org/viewcvs?rev=354242&view=rev
Log:
more detailed exception handling and error reporting.
Modified:
incubator/roller/trunk/src/org/roller/presentation/velocity/FlavorServlet.java
Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/FlavorServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/FlavorServlet.java?rev=354242&r1=354241&r2=354242&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/FlavorServlet.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/FlavorServlet.java Mon Dec 5 16:29:49 2005
@@ -15,6 +15,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.PageContext;
+import org.apache.velocity.exception.ResourceNotFoundException;
import org.roller.model.Roller;
import org.roller.model.RollerFactory;
import org.roller.model.UserManager;
@@ -54,6 +55,7 @@
HttpServletResponse response, Context ctx) {
RollerRequest rreq = null;
+ Template outty = null;
try {
rreq = RollerRequest.getRollerRequest(request,getServletContext());
@@ -105,7 +107,7 @@
ContextLoader.setupContext(ctx, rreq, response);
- final String useTemplate;
+ String useTemplate;
PageModel pageModel = (PageModel)ctx.get("pageModel");
if (request.getServletPath().endsWith("rss")) {
if (pageModel.getPageByName("_rss") != null)
@@ -130,12 +132,21 @@
useTemplate = "/flavors/rss.vm";
}
- return getTemplate(useTemplate);
- } catch (Exception e) {
- mLogger.error("ERROR in RssServlet", e);
+ outty = getTemplate(useTemplate);
+ } catch(ResourceNotFoundException rnfe) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ request.setAttribute("DisplayException", rnfe);
+
+ mLogger.error("ResourceNotFound: "+ request.getRequestURL());
+ mLogger.debug(rnfe);
+
+ } catch(Exception e) {
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ request.setAttribute("DisplayException", e);
+ mLogger.error(e);
}
- return null;
+ return outty;
}
//------------------------------------------------------------------------