diff options
Diffstat (limited to 'juick-www/src/main/java/com/juick/www/Main.java')
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/Main.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/juick-www/src/main/java/com/juick/www/Main.java b/juick-www/src/main/java/com/juick/www/Main.java index 57704f36..af8711ed 100644 --- a/juick-www/src/main/java/com/juick/www/Main.java +++ b/juick-www/src/main/java/com/juick/www/Main.java @@ -210,7 +210,12 @@ public class Main extends HttpServlet implements Stream.StreamListener { String uname = uri.substring(5); int uid = UserQueries.getUIDbyName(sql, uname); if (uid > 0) { - rss.doGet(sql, request, response, uid, uname); + try { + rss.doGet(sql, response, uid); + } catch (PebbleException e) { + log("pebble exception", e); + response.sendError(500); + } } else { response.sendError(404); } @@ -230,7 +235,12 @@ public class Main extends HttpServlet implements Stream.StreamListener { } else if (uri.startsWith("/_twitter")) { twitterAuth.doGet(sql, request, response); } else if (uri.equals("/signup")) { - signup.doGet(sql, request, response); + try { + signup.doGet(sql, request, response); + } catch (PebbleException e) { + log("pebble exception", e); + response.sendError(500); + } } else if (uri.equals("/help") || uri.equals("/help/")) { help.doRedirectToHelpIndex(response); } else if (uri.startsWith("/help/")) { |