From 46cd380010e1907bcb39d730a1dc4788e0d35dec Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Wed, 15 Feb 2017 09:10:24 +0100
Subject: [PATCH] 8174950: Gracefully handle null Supplier in
Objects.requireNonNull
Reviewed-by: dholmes, psandoz, alanb, chegar
---
jdk/src/java.base/share/classes/java/util/Objects.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/jdk/src/java.base/share/classes/java/util/Objects.java b/jdk/src/java.base/share/classes/java/util/Objects.java
index dad583b9206..c6bf3c96133 100644
--- a/jdk/src/java.base/share/classes/java/util/Objects.java
+++ b/jdk/src/java.base/share/classes/java/util/Objects.java
@@ -343,7 +343,8 @@ public final class Objects {
*/
public static <T> T requireNonNull(T obj, Supplier<String> messageSupplier) {
if (obj == null)
- throw new NullPointerException(messageSupplier.get());
+ throw new NullPointerException(messageSupplier == null ?
+ null : messageSupplier.get());
return obj;
}