root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Work around Framework regression in handling of null model values" 

This reverts commit 5fc67c545c.

Closes gh-16991
This commit is contained in:
Andy Wilkinson 2019-06-17 10:44:23 +01:00
parent 7d59b78829
commit 13a7a52c71
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
View File

@ -83,8 +83,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
HttpStatus errorStatus = determineHttpStatus(error); HttpStatus errorStatus = determineHttpStatus(error);
errorAttributes.put("status", errorStatus.value()); errorAttributes.put("status", errorStatus.value());
errorAttributes.put("error", errorStatus.getReasonPhrase()); errorAttributes.put("error", errorStatus.getReasonPhrase());
String message = determineMessage(error); errorAttributes.put("message", determineMessage(error));
errorAttributes.put("message", (message != null) ? message : "");
handleException(errorAttributes, determineException(error), includeStackTrace); handleException(errorAttributes, determineException(error), includeStackTrace);
return errorAttributes; return errorAttributes;
} }