From 562da7b04bc0fdc187b10b182ea66f98eec06f20 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sat, 2 Mar 2019 21:41:09 +0800
Subject: [PATCH] Fix NullPointerException when getting ServletException

---
 src/main/java/cc/ryanc/halo/model/domain/Tag.java             | 2 ++
 src/main/java/cc/ryanc/halo/model/domain/User.java            | 2 ++
 .../halo/web/controller/base/ControllerExceptionHandler.java  | 4 ++--
 .../cc/ryanc/halo/web/controller/core/CommonController.java   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/model/domain/Tag.java b/src/main/java/cc/ryanc/halo/model/domain/Tag.java
index 4922b3a26..f7e73fa58 100644
--- a/src/main/java/cc/ryanc/halo/model/domain/Tag.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Tag.java
@@ -2,6 +2,7 @@ package cc.ryanc.halo.model.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.ToString;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
@@ -18,6 +19,7 @@ import java.util.List;
  * @date : 2018/1/12
  */
 @Data
+@ToString
 @Entity
 @Table(name = "halo_tag")
 public class Tag implements Serializable {
diff --git a/src/main/java/cc/ryanc/halo/model/domain/User.java b/src/main/java/cc/ryanc/halo/model/domain/User.java
index 07d26aef3..a3f9021b3 100755
--- a/src/main/java/cc/ryanc/halo/model/domain/User.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/User.java
@@ -2,6 +2,7 @@ package cc.ryanc.halo.model.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.ToString;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -21,6 +22,7 @@ import java.util.Date;
  * @date : 2017/11/14
  */
 @Data
+@ToString
 @Entity
 @Table(name = "halo_user")
 public class User implements Serializable {
diff --git a/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java b/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
index a471c8e92..840fd4c40 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/base/ControllerExceptionHandler.java
@@ -53,7 +53,7 @@ public class ControllerExceptionHandler {
     public JsonResult handleConstraintViolationException(ConstraintViolationException e) {
         JsonResult jsonResult = handleBaseException(e);
         jsonResult.setCode(HttpStatus.BAD_REQUEST.value());
-        jsonResult.setMsg("Filed validation error");
+        jsonResult.setMsg("Field validation error");
         jsonResult.setResult(e.getConstraintViolations());
         return jsonResult;
     }
@@ -63,7 +63,7 @@ public class ControllerExceptionHandler {
     public JsonResult handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
         JsonResult jsonResult = handleBaseException(e);
         jsonResult.setCode(HttpStatus.BAD_REQUEST.value());
-        jsonResult.setMsg("Filed validation error");
+        jsonResult.setMsg("Field validation error");
         Map<String, String> errMap = ValidationUtils.mapWithFieldError(e.getBindingResult().getFieldErrors());
         jsonResult.setResult(errMap);
         return jsonResult;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
index 8d36776ce..31abc9a9a 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
@@ -39,7 +39,7 @@ public class CommonController implements ErrorController {
         // Get the exception
         Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception");
 
-        if (StringUtils.startsWithIgnoreCase(throwable.getMessage(), "Could not resolve view with name '")) {
+        if (throwable != null && StringUtils.startsWithIgnoreCase(throwable.getMessage(), "Could not resolve view with name '")) {
             // TODO May cause unreasoned problem
             // if Ftl was not found then redirect to /404
             return "redirect:/404";