From e0312a3359d7d2e7fe3d7771ad8d896133a2e2fc Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Mon, 12 Dec 2016 20:58:56 +0700
Subject: error page

---
 .../www/controllers/ShowMessageController.java     | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'juick-spring-www/src/main/java/com/juick/www/controllers/ShowMessageController.java')

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/ShowMessageController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/ShowMessageController.java
index e95bd7cf..df204c5f 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/ShowMessageController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/ShowMessageController.java
@@ -1,6 +1,7 @@
 package com.juick.www.controllers;
 
 import com.juick.User;
+import com.juick.server.util.HttpNotFoundException;
 import com.juick.service.MessagesService;
 import com.juick.service.UserService;
 import com.juick.util.WebUtils;
@@ -58,7 +59,7 @@ public class ShowMessageController {
 
                 model.addAttribute("messageId", anything);
 
-                return "postNotFound";
+                throw new HttpNotFoundException();
             }
         }
         return showUserMessages(anything, null, before, model);
@@ -88,7 +89,7 @@ public class ShowMessageController {
         User user = userService.getUserByName(userName);
         if (user == null) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         return "index";
@@ -101,13 +102,13 @@ public class ShowMessageController {
         // Check validity of user name before quering from database
         if (WebUtils.isNotUserName(userName)) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         User user = userService.getUserByName(userName);
         if (user == null) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         return "index";
@@ -120,13 +121,13 @@ public class ShowMessageController {
         // Check validity of user name before quering from database
         if (WebUtils.isNotUserName(userName)) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         User user = userService.getUserByName(userName);
         if (user == null) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         return "index";
@@ -139,13 +140,13 @@ public class ShowMessageController {
         // Check validity of user name before quering from database
         if (WebUtils.isNotUserName(userName)) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         User user = userService.getUserByName(userName);
         if (user == null) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         return "index";
@@ -159,19 +160,19 @@ public class ShowMessageController {
         // Check validity of post number before quering from database
         if (WebUtils.isNotPostNumber(postNumber)) {
             model.addAttribute("messageId", postNumber);
-            return "postNotFound";
+            throw new HttpNotFoundException();
         }
 
         // Check validity of user name before quering from database
         if (WebUtils.isNotUserName(userName)) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
         User user = userService.getUserByName(userName);
         if (user == null) {
             model.addAttribute("userName", userName);
-            return "userNotFound";
+            throw new HttpNotFoundException();
         }
 
 
-- 
cgit v1.2.3