Commit 13a7a52c authored by Andy Wilkinson's avatar Andy Wilkinson

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

This reverts commit 5fc67c54.

Closes gh-16991
parent 7d59b788
...@@ -83,8 +83,7 @@ public class DefaultErrorAttributes implements ErrorAttributes { ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment