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

Merge pull request #14912 from dreis2211 

* gh-14912:
  Use Errors.hasErrors() in DefaultErrorAttributes
This commit is contained in:
Madhura Bhave 2018-10-22 21:51:56 -07:00
parent d6991e6d91 3fea487c7b
commit 44e96013ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
} }
if (error instanceof BindingResult) { if (error instanceof BindingResult) {
BindingResult result = (BindingResult) error; BindingResult result = (BindingResult) error;
if (result.getErrorCount() > 0) { if (result.hasErrors()) {
errorAttributes.put("errors", result.getAllErrors()); errorAttributes.put("errors", result.getAllErrors());
} }
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -159,7 +159,7 @@ public class DefaultErrorAttributes
errorAttributes.put("message", error.getMessage()); errorAttributes.put("message", error.getMessage());
return; return;
} }
if (result.getErrorCount() > 0) { if (result.hasErrors()) {
errorAttributes.put("errors", result.getAllErrors()); errorAttributes.put("errors", result.getAllErrors());
errorAttributes.put("message", errorAttributes.put("message",
"Validation failed for object='" + result.getObjectName() "Validation failed for object='" + result.getObjectName()