Merge branch '5.1.x'

2019-05-13 18:05:07 +02:00
parent 9ca8681f79 0796d9af0d
commit 9755b59197
3 changed files with 12 additions and 6 deletions
--- a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
+++ b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
@@ -76,9 +76,9 @@ public abstract class AssertionErrors {
 	 * {@link AssertionError} otherwise.
 	 * @param message a message that describes the reason for the failure
 	 * @param object the object to check
-	 * @since 5.1
+	 * @since 5.1.8
 	 */
-	public static void assertNotNull(String message, Object object) {
+	public static void assertNotNull(String message, @Nullable Object object) {
 		assertTrue(message, object != null);
 	}