Merge pull request #20923 from zolikm

snicoll · snicoll · commit 619fe38de37a · 2020-04-17T16:01:58.000+02:00
* pr/20923: Use RequestDispatcher.ERROR_STATUS_CODE constant Closes gh-20923
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -103,7 +104,7 @@ protected boolean getBooleanParameter(HttpServletRequest request, String paramet
 	}
 
 	protected HttpStatus getStatus(HttpServletRequest request) {
-		Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
+		Integer statusCode = (Integer) request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
 		if (statusCode == null) {
 			return HttpStatus.INTERNAL_SERVER_ERROR;
 		}

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import java.util.List;`
`21`	`21`	`import java.util.Map;`
`22`	`22`
	`23`	`+import javax.servlet.RequestDispatcher;`
`23`	`24`	`import javax.servlet.http.HttpServletRequest;`
`24`	`25`	`import javax.servlet.http.HttpServletResponse;`
`25`	`26`
`@@ -103,7 +104,7 @@ protected boolean getBooleanParameter(HttpServletRequest request, String paramet`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`protected HttpStatus getStatus(HttpServletRequest request) {`
`106`		`- Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");`
	`107`	`+ Integer statusCode = (Integer) request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);`
`107`	`108`	`if (statusCode == null) {`
`108`	`109`	`return HttpStatus.INTERNAL_SERVER_ERROR;`
`109`	`110`	`}`