From 3fea487c7b51d226b1363a68104d50f2f240e680 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sat, 20 Oct 2018 14:45:46 +0200 Subject: [PATCH] Use Errors.hasErrors() in DefaultErrorAttributes Closes gh-14912 --- .../boot/web/reactive/error/DefaultErrorAttributes.java | 2 +- .../boot/web/servlet/error/DefaultErrorAttributes.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java index 3054d2d18cd..62dd8ecd90f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java @@ -141,7 +141,7 @@ public class DefaultErrorAttributes implements ErrorAttributes { } if (error instanceof BindingResult) { BindingResult result = (BindingResult) error; - if (result.getErrorCount() > 0) { + if (result.hasErrors()) { errorAttributes.put("errors", result.getAllErrors()); } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java index 00634fe4ee7..4d4e744ed68 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java @@ -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"); * you may not use this file except in compliance with the License. @@ -159,7 +159,7 @@ public class DefaultErrorAttributes errorAttributes.put("message", error.getMessage()); return; } - if (result.getErrorCount() > 0) { + if (result.hasErrors()) { errorAttributes.put("errors", result.getAllErrors()); errorAttributes.put("message", "Validation failed for object='" + result.getObjectName()