[jboss-svn-commits] JBL Code SVN: r5324 - labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2006-07-27 16:41:56 -0400 (Thu, 27 Jul 2006)
New Revision: 5324

Modified:
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java
Log:
http://jira.jboss.org/jira/browse/JBSHOTOKU-38

Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java	2006-07-27 20:37:29 UTC (rev 5323)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java	2006-07-27 20:41:56 UTC (rev 5324)
@@ -32,9 +32,11 @@
 import org.jboss.shotoku.feeds.tools.FeedsTools;
 
 public class FeedsServlet extends HttpServlet {
-    private void invalidRequest(HttpServletResponse response) throws IOException {
+    private void invalidRequest(HttpServletResponse response, String msg)
+            throws IOException {
         response.setContentType("text/html");
-        response.getWriter().println("The feed you requested is not available.");
+        response.getWriter().println("The feed you requested is not " +
+                "available: " + msg + ".");
     }
 
     @Override
@@ -53,7 +55,7 @@
         int lastSlash = requestURI.lastIndexOf('/');
 
         if (lastSlash == -1) {
-            invalidRequest(response);
+            invalidRequest(response, "Invalid path");
             return;
         }
 
@@ -63,11 +65,15 @@
         Feed feed = FeedsTools.getService().getFeed("default", name, type);
 
         if (feed == null) {
-            invalidRequest(response);
+            invalidRequest(response, "Feed not found");
             return;
         }
 
-        feed.write(response, request);
+        try {
+            feed.write(response, request);
+        } catch (IOException e) {
+            invalidRequest(response, e.getMessage());
+        }
     }
 
 }