Merge remote-tracking branch 'origin/master'

2017-03-27 11:47:04 +03:00
parent 8db8c85b69 f78bc953f4
commit e3afd35c0d
1 changed files with 1 additions and 1 deletions
--- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
@@ -126,7 +126,7 @@ public abstract class ValidationUtils {
 	}

 	/**
-	 * Reject the given field with the given error codea nd error arguments
+	 * Reject the given field with the given error code and error arguments
 	 * if the value is empty.
 	 * <p>An 'empty' value in this context means either {@code null} or
 	 * the empty string "".