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

Re-arrange priority of error message

This commit is contained in:
Dave Syer 2014-10-27 11:08:53 +00:00
parent 7bac7370c8
commit 254ab55476
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorAttributes.java
View File

@ -75,7 +75,7 @@ public class DefaultErrorAttributes implements ErrorAttributes, HandlerException
private void storeErrorAttributes(HttpServletRequest request, Exception ex) { private void storeErrorAttributes(HttpServletRequest request, Exception ex) {
request.setAttribute(ERROR_ATTRIBUTE, ex); request.setAttribute(ERROR_ATTRIBUTE, ex);
} }
@Override @Override
@ -121,9 +121,8 @@ public class DefaultErrorAttributes implements ErrorAttributes, HandlerException
addStackTrace(errorAttributes, error); addStackTrace(errorAttributes, error);
} }
} }
if (error==null || errorAttributes.get("message")==null) { Object message = getAttribute(requestAttributes, "javax.servlet.error.message");
Object message = getAttribute(requestAttributes, if (message != null || errorAttributes.get("message") == null) {
"javax.servlet.error.message");
errorAttributes.put("message", message == null ? "No message available" errorAttributes.put("message", message == null ? "No message available"
: message); : message);
} }