From 2a3b5d21f59d0353a1d5de806eb9b01ecd260034 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Fri, 30 Jun 2023 15:50:52 -0400 Subject: [PATCH] Fix NPE in DefaultErrorController Closes gh-1286 --- .../src/main/java/sample/web/DefaultErrorController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/demo-authorizationserver/src/main/java/sample/web/DefaultErrorController.java b/samples/demo-authorizationserver/src/main/java/sample/web/DefaultErrorController.java index f0fc8a26..af4a3c06 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/web/DefaultErrorController.java +++ b/samples/demo-authorizationserver/src/main/java/sample/web/DefaultErrorController.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; /** @@ -44,7 +45,8 @@ public class DefaultErrorController implements ErrorController { } private String getErrorMessage(HttpServletRequest request) { - return (String) request.getAttribute(RequestDispatcher.ERROR_MESSAGE); + String errorMessage = (String) request.getAttribute(RequestDispatcher.ERROR_MESSAGE); + return StringUtils.hasText(errorMessage) ? errorMessage : ""; } }